diff --git a/hosts.astana b/env-prod-astana/hosts.astana similarity index 100% rename from hosts.astana rename to env-prod-astana/hosts.astana diff --git a/hosts.hy b/hosts.hy deleted file mode 100644 index 8661507..0000000 --- a/hosts.hy +++ /dev/null @@ -1,8 +0,0 @@ -[all:vars] -ansible_user=root - -[blade-00] -192.168.10.41 - -[blade-01] -192.168.10.42 diff --git a/hosts.ycx b/hosts.ycx deleted file mode 100644 index 1d33978..0000000 --- a/hosts.ycx +++ /dev/null @@ -1,8 +0,0 @@ -[all:vars] -ansible_user=root - -[blade-00] -192.168.40.161 - -[blade-01] -192.168.40.162 diff --git a/roles/mrzcpd/tasks/main.yml b/roles/mrzcpd/tasks/main.yml index 2ffbc27..b3c7bce 100644 --- a/roles/mrzcpd/tasks/main.yml +++ b/roles/mrzcpd/tasks/main.yml @@ -11,24 +11,24 @@ - name: "update sysconfig/mrzcpd" template: - path: "{{ role_path }}/templates/mrzcpd.j2" + src: "{{ role_path }}/templates/mrzcpd.j2" dest: /etc/sysconfig/mrzcpd - name: "update mrglobal.conf - slave blade" template: - path: "{{ role_path }}/templates/mrglobal.conf.traffic_mirror.j2" + src: "{{ role_path }}/templates/mrglobal.conf.traffic_mirror.j2" dest: /opt/mrzcpd/etc/mrglobal.conf when: nic_traffic_mirror is defined - name: "update mrglobal.conf - master blade" template: - path: "{{ role_path }}/templates/mrglobal.conf.inline.j2" + src: "{{ role_path }}/templates/mrglobal.conf.inline.j2" dest: /opt/mrzcpd/etc/mrglobal.conf when: nic_traffic_mirror is not defined - name: "update mrtunnat.conf - master blade" template: - path: "{{ role_path }}/templates/mrtunnat.conf.inline.j2" + src: "{{ role_path }}/templates/mrtunnat.conf.inline.j2" dest: /opt/mrzcpd/etc/mrtunnat.conf when: nic_traffic_mirror is not defined diff --git a/roles/tfe/files/tfe-4.1.1.48a5f7a-1.el7.x86_64.rpm b/roles/tfe/files/tfe-4.1.1.48a5f7a-1.el7.x86_64.rpm deleted file mode 100644 index 7d76a42..0000000 Binary files a/roles/tfe/files/tfe-4.1.1.48a5f7a-1.el7.x86_64.rpm and /dev/null differ diff --git a/roles/tfe/files/tfe-4.1.2.af90bc7-1.el7.x86_64.rpm b/roles/tfe/files/tfe-4.1.2.af90bc7-1.el7.x86_64.rpm new file mode 100644 index 0000000..5cb6c6a Binary files /dev/null and b/roles/tfe/files/tfe-4.1.2.af90bc7-1.el7.x86_64.rpm differ diff --git a/roles/tfe/tasks/main.yml b/roles/tfe/tasks/main.yml index 91d3820..d860837 100644 --- a/roles/tfe/tasks/main.yml +++ b/roles/tfe/tasks/main.yml @@ -11,21 +11,21 @@ vars: packages: - /tmp/ansible_deploy/tfe-kmod-v1.0.3.20190828-1dkms.noarch.rpm - - /tmp/ansible_deploy/tfe-4.1.1.48a5f7a-1.el7.x86_64.rpm + - /tmp/ansible_deploy/tfe-4.1.2.af90bc7-1.el7.x86_64.rpm - name: "template tfe-env config" template: - path: "{{ role_path }}/templates/tfe-env-config.j2" + src: "{{ role_path }}/templates/tfe-env-config.j2" dest: /etc/sysconfig/tfe-env-config - name: "template the tfe.conf" template: - path: "{{ role_path }}/templates/tfe.conf.j2" + src: "{{ role_path }}/templates/tfe.conf.j2" dest: /opt/tsg/tfe/conf/tfe/tfe.conf - name: "template the pangu_pxy.conf" template: - path: "{{ role_path }}/templates/pangu_pxy.conf.j2" + src: "{{ role_path }}/templates/pangu_pxy.conf.j2" dest: /opt/tsg/tfe/conf/pangu/pangu_pxy.conf - name: "enable tfe-env" @@ -37,5 +37,5 @@ - name: "enable tfe" systemd: name: tfe - enable: yes + enabled: yes daemon_reload: yes