gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix:TSG-7836:当NPB_device为tera,provision删除inline_device_settings相关配置,tsg-os-provision执行失败问题

Browse Source
This commit is contained in:
fumingwei
2021-09-20 21:10:41 +08:00
parent 93eeff1651
commit cdabffaed4
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/kni/templates/kni.conf.j2
View File

@@ -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]

24
ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN0P01R01
View File

@@ -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: