7400 adapt:合并tsg_9140_deploy.yml和tsg_7400_deploy.yml内容到stage_one_deploy.yml，合并ansible-stage-one-7400和ansible-stage-one-9140到ansible-stage-one

ansible/stage_one_deploy.yml

@@ -39,4 +39,31 @@
     - {role: mrzcpd, tags: mrzcpd}
     - {role: exporter, tags: exporter}
     - {role: tsg_sn, tags: tsg_sn}
-    - {role: tfe, tags: tfe}
+    - {role: tfe, tags: tfe}
+
+- hosts: 9000-NPB-P01R01
+  remote_user: root
+  vars_files:
+    - install_config/group_vars/stage_one_9000NPBP01R01.yml
+    - install_config/group_vars/rpm_version.yml
+  roles:
+    - {role: tsg-os-provision, tags: tsg-os-provision}
+    - {role: tsg_device_tag, tags: tsg_device_tag}
+    - {role: tsg_sn, tags: tsg_sn}
+    - {role: framework, tags: framework}
+    - {role: mrzcpd, tags: mrzcpd}
+    - {role: sapp, tags: sapp}
+    - {role: tsg_master, tags: tsg_master}
+    - {role: kni, tags: kni}
+    - {role: firewall, tags: firewall}
+    - {role: tsg_app, tags: tsg_app}
+    - {role: i40e-drive, tags: i40e-drive}
+    - {role: redis, tags: redis}
+    - {role: certstore, tags: certstore}
+    - {role: tfe, tags: tfe}
+    - {role: telegraf_statistic, tags: telegraf_statistic}
+    - {role: exporter, tags: exporter}
+    - {role: docker, tags: docker}
+    - {role: tsg-diagnose, tags: tsg-diagnose}
+    - {role: system-init, tags: system-init}
+    - {role: system-init-9140, tags: system-init-9140}

ansible/tsg_9140_deploy.yml

@@ -1,33 +0,0 @@
-- hosts: tsg_9140_chroot
-  remote_user: root
-  vars_files:
-    - install_config/group_vars/stage_one_9000NPBP01R01.yml
-    - install_config/group_vars/rpm_version.yml
-  roles:
-    #- {role: init-env, tags: init-env}
-    - {role: tsg-os-provision, tags: tsg-os-provision}
-    - {role: tsg_device_tag, tags: tsg_device_tag}
-    - {role: tsg_sn, tags: tsg_sn}
-    - {role: framework, tags: framework}
-    #- {role: kernel-ml, tags: kernel-ml}
-    - {role: mrzcpd, tags: mrzcpd}
-    #- {role: tsg-9140-env, tags: tsg-9140-env}
-    - {role: sapp, tags: sapp}
-    - {role: tsg_master, tags: tsg_master}
-    - {role: kni, tags: kni}
-    - {role: firewall, tags: firewall}
-    - {role: tsg_app, tags: tsg_app}
-    #- {role: http_healthcheck,tags: http_healthcheck}
-    - {role: i40e-drive, tags: i40e-drive}
-    - {role: redis, tags: redis}
-    - {role: certstore, tags: certstore}
-    #- {role: redis, tags: redis}
-    #- {role: cert-redis, tags: cert-redis}
-    #83上没有- {role: maat-redis, tags: maat-redis, when: deploy_mode == "cluster"}
-    - {role: tfe, tags: tfe}
-    - {role: telegraf_statistic, tags: telegraf_statistic}
-    - {role: exporter, tags: exporter}
-    - {role: docker, tags: docker}
-    - {role: tsg-diagnose, tags: tsg-diagnose}
-    - {role: system-init, tags: system-init}
-    - {role: system-init-9140, tags: system-init-9140}