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

bugfix:修改stage2通过set_fact渲染配置文件错误的bug

Browse Source
This commit is contained in:
fumingwei
2021-06-25 11:43:12 +08:00
parent 85e9a783cd
commit f13b9bd5ee
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01
View File

@@ -53,21 +53,21 @@
- name: "set sapp_overlay_mode var depend on NPB device"
set_fact:
sapp_overlay_mode: item.sapp_overlay_mode
gdev_conf_keep_alive_ip: item.gdev_conf_keep_alive_ip
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": 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 }
- name: "set cm_policy_server_ip var depend on enable_policy_local_cache"
set_fact:
cm_policy_server_ip: item.cm_policy_server_ip
cm_policy_server_ip: "{{ item.cm_policy_server_ip }}"
when: feature.enable_policy_local_cache == item.enable_policy_local_cache
with_items:
- { "enable_policy_local_cache": 1, "npb_device": tera, "cm_policy_server_ip": 192.168.100.1 }
- { "enable_policy_local_cache": 0, "npb_device": inline_device, "cm_policy_server_ip": cm.policy_server.address }
- { "enable_policy_local_cache": 0, "npb_device": inline_device, "cm_policy_server_ip": "{{ cm.policy_server.address }}" }
- name: "tsg-os-provision: Template the asymmetric_presence_layer.conf.j2"
template:

4
ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN123P01R01
View File

@@ -44,11 +44,11 @@
- name: "set cm_policy_server_ip var depend on enable_policy_local_cache"
set_fact:
cm_policy_server_ip: item.cm_policy_server_ip
cm_policy_server_ip: "{{ item.cm_policy_server_ip }}"
when: feature.enable_policy_local_cache == item.enable_policy_local_cache
with_items:
- { "enable_policy_local_cache": 1, "npb_device": tera, "cm_policy_server_ip": 192.168.100.1 }
- { "enable_policy_local_cache": 0, "npb_device": inline_device, "cm_policy_server_ip": cm.policy_server.address }
- { "enable_policy_local_cache": 0, "npb_device": inline_device, "cm_policy_server_ip": "{{cm.policy_server.address}}" }
- name: "tsg-os-provision: template the tsg_device_tag"
template: