From b49d10c4f31751246a37cf3f20eef30e8d6e69c8 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Tue, 4 Apr 2023 17:55:54 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:7400=E5=92=8C9140=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=81=9C=E7=94=A8shaping=5Fmaster,=E6=9A=82=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E5=90=AF=E7=94=A8conusl=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/roles/consul/tasks/main.yml             | 10 +++++-----
 ansible/roles/sapp/templates/conflist.inf.j2.j2 |  3 ---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/consul/tasks/main.yml b/ansible/roles/consul/tasks/main.yml
index 76d14636..8f67d212 100644
--- a/ansible/roles/consul/tasks/main.yml
+++ b/ansible/roles/consul/tasks/main.yml
@@ -50,11 +50,11 @@
 #    dest: /etc/consul.d/server.hcl
 #  when: runtime_env != 'TSG-X-P0906'
 
-- name: "start consul"
-  systemd:
-    name: consul.service
-    enabled: yes
-  when: runtime_env != 'TSG-X-P0906'
+# - name: "start consul"
+#   systemd:
+#     name: consul.service
+#     enabled: yes
+#   when: runtime_env != 'TSG-X-P0906'
 
 - name: "get consul chart images to dest"
   get_url:
diff --git a/ansible/roles/sapp/templates/conflist.inf.j2.j2 b/ansible/roles/sapp/templates/conflist.inf.j2.j2
index 394e42e7..3858f566 100644
--- a/ansible/roles/sapp/templates/conflist.inf.j2.j2
+++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2
@@ -20,9 +20,6 @@
 {% if ddossketch.enable == 1 %}
 ./plug/platform/tsg_ddos_sketch/tsg_ddos_sketch.inf
 {% endif %}
-{% if shaping.enable == 1 %}
-./plug/platform/shaping_master/shaping_master.inf
-{% endif %}
 {% endraw %}
 
 [protocol]