feature:7400和9140配置默认不启动consul服务v23.07.12

9 files changed, 22 insertions, 10 deletions

diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01
index 229b3803..d812dcfc 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01
@@ -94,7 +94,7 @@ consul_agent:
   node_name: ""
 
 shaping:
-  enable: 1
+  enable: 0
 
 sid:
   shaping: 1000
\ No newline at end of file
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01
index c9992a50..bd45d46a 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01
@@ -93,7 +93,7 @@ consul_agent:
   node_name: ""
 
 shaping:
-  enable: 1
+  enable: 0
 
 sid:
   shaping: 1000
\ No newline at end of file
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.SERVER b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.SERVER
index 78ca0b0b..a401180f 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.SERVER
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.SERVER
@@ -89,4 +89,4 @@ consul_agent:
   node_name: ""
 
 shaping:
-  enable: 1
\ No newline at end of file
+  enable: 0
\ No newline at end of file
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P0804 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P0804
index c97ffca1..f1a0356c 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P0804
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P0804
@@ -102,7 +102,7 @@ consul_agent:
   node_name: ""
 
 shaping:
-  enable: 1
+  enable: 0
 
 sid:
   shaping: 1000
\ No newline at end of file
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403
index 5edf6db0..819de4c9 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403
@@ -101,7 +101,7 @@ consul_agent:
   node_name: ""
 
 shaping:
-  enable: 1
+  enable: 0
 
 sid:
   shaping: 1000
\ No newline at end of file
diff --git a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN0P01R01
index e31a25ee..31d46c43 100644
--- a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN0P01R01
+++ b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN0P01R01
@@ -206,6 +206,7 @@
         src: "../templates/consul.hcl.j2"
         dest: /etc/consul.d/consul.hcl
       tags: consul
+      when: shaping.enable == 1
 
     - name: "mkdir /opt/tsg/etc/"
       file:
@@ -279,7 +280,9 @@
       systemd:
         name: consul
         state: restarted
-      when: enable_config_apply == '1'
+      when: 
+        - enable_config_apply == '1'
+        - shaping.enable == 1
 
     - name: "tsg-os-provision: restart mrenv"
       systemd:
diff --git a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.9000NPBP01R01
index 091d0d67..d1091bdb 100644
--- a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.9000NPBP01R01
+++ b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.9000NPBP01R01
@@ -155,7 +155,8 @@
       template:
         src: "../templates/consul.hcl.j2"
         dest: /etc/consul.d/consul.hcl
-      tags: consul      
+      tags: consul
+      when: shaping.enable == 1
 
     - name: "mkdir /opt/tsg/etc/"
       file:
@@ -250,7 +251,9 @@
       systemd:
         name: consul
         state: restarted
-      when: enable_config_apply == '1'
+      when:
+        - enable_config_apply == '1'
+        - shaping.enable == 1
 
     - name: "tsg-os-provision: start mrenv"
       systemd:
diff --git a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P0804 b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P0804
index e927860f..9994d50b 100644
--- a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P0804
+++ b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P0804
@@ -225,6 +225,7 @@
         src: "../templates/consul.hcl.j2"
         dest: /etc/consul.d/consul.hcl
       tags: consul
+      when: shaping.enable == 1
 
     - name: "mkdir /opt/tsg/etc/"
       file:
@@ -315,7 +316,9 @@
       systemd:
         name: consul
         state: restarted
-      when: enable_config_apply == '1'
+      when: 
+        - enable_config_apply == '1'
+        - shaping.enable == 1
 
     - name: "tsg-os-provision: restart mrenv"
       systemd:
diff --git a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P1403 b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P1403
index a10b7cc8..8c86b4f3 100644
--- a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P1403
+++ b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P1403
@@ -113,6 +113,7 @@
         src: "../templates/consul.hcl.j2"
         dest: /etc/consul.d/consul.hcl
       tags: consul
+      when: shaping.enable == 1
 
     - name: "mkdir /opt/tsg/etc/"
       file:
@@ -165,7 +166,9 @@
       systemd:
         name: consul
         state: restarted
-      when: enable_config_apply == '1'
+      when:
+        - enable_config_apply == '1'
+        - shaping.enable == 1
 
     - name: "tsg-os-provision: restart mrenv"
       systemd: