diff --git a/ansible/roles/i40e-drive/tasks/main.yml b/ansible/roles/i40e-drive/tasks/main.yml index fead02a2..a5c9caeb 100644 --- a/ansible/roles/i40e-drive/tasks/main.yml +++ b/ansible/roles/i40e-drive/tasks/main.yml @@ -17,7 +17,4 @@ state: present - name: "update depmod" - shell: depmod -v 5.4.113-1.el7.elrepo.x86_64 - -- name: "update initramfs" - shell: dracut --force -v /boot/initramfs-5.4.113-1.el7.elrepo.x86_64.img 5.4.113-1.el7.elrepo.x86_64 \ No newline at end of file + shell: depmod -v 5.4.113-1.el7.elrepo.x86_64 \ No newline at end of file diff --git a/ansible/roles/system-init-7400-mcn0/tasks/main.yml b/ansible/roles/system-init-7400-mcn0/tasks/main.yml index 59eb477e..4b234762 100644 --- a/ansible/roles/system-init-7400-mcn0/tasks/main.yml +++ b/ansible/roles/system-init-7400-mcn0/tasks/main.yml @@ -21,9 +21,6 @@ - name: "update depmod" shell: depmod -v 5.4.113-1.el7.elrepo.x86_64 -- name: "update initramfs" - shell: dracut --force -v /boot/initramfs-5.4.113-1.el7.elrepo.x86_64.img 5.4.113-1.el7.elrepo.x86_64 - - name: "set eth_pf" template: src: "{{ role_path }}/templates/ifcfg-eth_pf.j2" diff --git a/ansible/roles/system-init-7400-mcn123/tasks/main.yml b/ansible/roles/system-init-7400-mcn123/tasks/main.yml index f12d2e60..ede05e3c 100644 --- a/ansible/roles/system-init-7400-mcn123/tasks/main.yml +++ b/ansible/roles/system-init-7400-mcn123/tasks/main.yml @@ -21,9 +21,6 @@ - name: "update depmod" shell: depmod -v 5.4.113-1.el7.elrepo.x86_64 -- name: "update initramfs" - shell: dracut --force -v /boot/initramfs-5.4.113-1.el7.elrepo.x86_64.img 5.4.113-1.el7.elrepo.x86_64 - - name: "set eth_pf" template: src: "{{ role_path }}/templates/ifcfg-eth_pf.j2" diff --git a/ansible/roles/system-init-9140/tasks/main.yml b/ansible/roles/system-init-9140/tasks/main.yml index 5e35dd90..8df204f7 100644 --- a/ansible/roles/system-init-9140/tasks/main.yml +++ b/ansible/roles/system-init-9140/tasks/main.yml @@ -213,4 +213,12 @@ - name: "enable watchdog" systemd: name: watchdog - enabled: yes \ No newline at end of file + enabled: yes + +# 关闭DHCPDISCOVER +- name: "set 90-9000-dracut.rules" + template: + src: "{{ role_path }}/templates/90-9000-dracut.rules.j2" + dest: /usr/lib/dracut/dracut.conf.d/90-9000-dracut.conf + mode: 0644 + tags: template \ No newline at end of file diff --git a/ansible/roles/system-init-9140/templates/90-9000-dracut.rules.j2 b/ansible/roles/system-init-9140/templates/90-9000-dracut.rules.j2 new file mode 100644 index 00000000..0469b190 --- /dev/null +++ b/ansible/roles/system-init-9140/templates/90-9000-dracut.rules.j2 @@ -0,0 +1 @@ +omit_dracutmodules+="ifcfg network" \ No newline at end of file diff --git a/ansible/roles/system-init/tasks/main.yml b/ansible/roles/system-init/tasks/main.yml index 81ad2423..2b8bf755 100644 --- a/ansible/roles/system-init/tasks/main.yml +++ b/ansible/roles/system-init/tasks/main.yml @@ -6,3 +6,6 @@ - name: "set sshd UseDns no" shell: sed -i 's/#UseDNS yes/UseDNS no/g' /etc/ssh/sshd_config + +- name: "update initramfs" + shell: dracut --force -v /boot/initramfs-5.4.113-1.el7.elrepo.x86_64.img 5.4.113-1.el7.elrepo.x86_64 \ No newline at end of file diff --git a/ansible/stage_one_deploy.yml b/ansible/stage_one_deploy.yml index fc53bba1..f021b869 100644 --- a/ansible/stage_one_deploy.yml +++ b/ansible/stage_one_deploy.yml @@ -5,7 +5,6 @@ - install_config/group_vars/rpm_version.yml roles: - {role: tsg-os-provision, tags: tsg-os-provision} - - {role: system-init, tags: system-init} - {role: system-init-7400-mcn0, tags: system-init-7400-mcn0} - {role: tsg_device_tag, tags: tsg_device_tag} - {role: tsg_sn, tags: tsg_sn} @@ -24,6 +23,7 @@ - {role: telegraf_statistic, tags: telegraf_statistic} - {role: exporter, tags: exporter} - {role: tsg-diagnose, tags: tsg-diagnose} + - {role: system-init, tags: system-init} - hosts: 7400-MCN123-P01R01 remote_user: root @@ -32,7 +32,6 @@ - install_config/group_vars/rpm_version.yml roles: - {role: tsg-os-provision, tags: tsg-os-provision} - - {role: system-init, tags: system-init} - {role: system-init-7400-mcn123, tags: system-init-7400-mcn123} - {role: tsg_device_tag, tags: tsg_device_tag} - {role: framework, tags: framework} @@ -40,6 +39,7 @@ - {role: exporter, tags: exporter} - {role: tsg_sn, tags: tsg_sn} - {role: tfe, tags: tfe} + - {role: system-init, tags: system-init} - hosts: 9000-NPB-P01R01 remote_user: root @@ -66,5 +66,5 @@ - {role: docker, tags: docker} - {role: tsg-diagnose, tags: tsg-diagnose} - {role: tsg-9140-NPB-rmp, tags: tsg-9140-NPB-rmp} - - {role: system-init, tags: system-init} - - {role: system-init-9140, tags: system-init-9140} \ No newline at end of file + - {role: system-init-9140, tags: system-init-9140} + - {role: system-init, tags: system-init} \ No newline at end of file