From cdabffaed479df017e335a1a93745f1d996c643a Mon Sep 17 00:00:00 2001 From: fumingwei Date: Mon, 20 Sep 2021 21:10:41 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:TSG-7836:=E5=BD=93NPB=5Fdevice=E4=B8=BAt?= =?UTF-8?q?era,provision=E5=88=A0=E9=99=A4inline=5Fdevice=5Fsettings?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE,tsg-os-provision=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/roles/kni/templates/kni.conf.j2 | 2 +- .../files/tasks/provision.yml.7400MCN0P01R01 | 24 ++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ansible/roles/kni/templates/kni.conf.j2 b/ansible/roles/kni/templates/kni.conf.j2 index e9677e35..32a62279 100644 --- a/ansible/roles/kni/templates/kni.conf.j2 +++ b/ansible/roles/kni/templates/kni.conf.j2 @@ -70,7 +70,7 @@ APP_NAME = fs2_kni #self test Shunt rules security policy id [tsg_diagnose] enabled = 1 -security_policy_id = 3,10 +security_policy_id = 3,4 [ssl_dynamic_bypass] 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 80e4adfe..ed51eeb6 100644 --- a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN0P01R01 +++ b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN0P01R01 @@ -64,15 +64,23 @@ success_msg: "{{ result_exec_adapt_tera_network_setting.stdout_lines }}" when: npb_device == 'tera' - - name: "set sapp_overlay_mode var depend on NPB device" + - name: "set sapp_overlay_mode var when NPB device is tera" set_fact: - sapp_overlay_mode: "{{ item.sapp_overlay_mode }}" - gdev_conf_keep_alive_ip: "{{ item.gdev_conf_keep_alive_ip }}" - when: npb_device == item.npb_device - with_items: - - { "sapp_overlay_mode": none, "npb_device": tera, "gdev_conf_keep_alive_ip": 127.0.0.1 } - - { "sapp_overlay_mode": vxlan, "npb_device": inline_device, "gdev_conf_keep_alive_ip": "{{ inline_device_settings.keepalive.ip }}" } - - { "sapp_overlay_mode": none, "npb_device": direct, "gdev_conf_keep_alive_ip": 127.0.0.1 } + sapp_overlay_mode: "none" + gdev_conf_keep_alive_ip: "127.0.0.1" + when: npb_device == 'tera' + + - name: "set sapp_overlay_mode var when NPB device is inline_device" + set_fact: + sapp_overlay_mode: "vxlan" + gdev_conf_keep_alive_ip: "{{ inline_device_settings.keepalive.ip }}" + when: npb_device == 'inline_device' + + - name: "set sapp_overlay_mode var when NPB device is direct" + set_fact: + sapp_overlay_mode: "none" + gdev_conf_keep_alive_ip: "127.0.0.1" + when: npb_device == 'direct' - name: "set cm_policy_server_ip var depend on enable_policy_local_cache" set_fact: