From f13b9bd5eed4a937be25bdfdb4ac6d1f3e2759a0 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Fri, 25 Jun 2021 11:43:12 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E6=94=B9stage2=E9=80=9A?= =?UTF-8?q?=E8=BF=87set=5Ffact=E6=B8=B2=E6=9F=93=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=94=99=E8=AF=AF=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provision_tasks_files/provision.yml.7400MCN0P01R01 | 10 +++++----- .../provision.yml.7400MCN123P01R01 | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 index b77e413e..bacf40d7 100644 --- a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 +++ b/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 @@ -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: diff --git a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN123P01R01 b/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN123P01R01 index bfaccd78..ca4aa1c3 100644 --- a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN123P01R01 +++ b/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN123P01R01 @@ -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: