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 5f297fe0..6c0f4f7c 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 @@ -23,7 +23,7 @@ - result_exec_setup_policy_log_nic_network.rc == 0 - result_exec_setup_policy_log_nic_network.failed == False fail_msg: "error:{{ result_exec_setup_policy_log_nic_network.stderr }},stdout:{{ result_exec_setup_policy_log_nic_network }}" - success_msg: "{{ result_exec_setup_policy_log_nic_network.stdout_lines[0] }}" + success_msg: "{{ result_exec_setup_policy_log_nic_network.stdout_lines }}" - name: "template adapt_tera_network_setting.sh when NPB device is tera" template: @@ -48,7 +48,7 @@ - result_exec_adapt_tera_network_setting.rc == 0 - result_exec_adapt_tera_network_setting.failed == False fail_msg: "error:{{ result_exec_adapt_tera_network_setting.stderr }},stdout:{{ result_exec_adapt_tera_network_setting }}" - success_msg: "{{ result_exec_adapt_tera_network_setting.stdout_lines[0] }}" + success_msg: "{{ result_exec_adapt_tera_network_setting.stdout_lines }}" when: npb_device == 'tera' - name: "set sapp_overlay_mode var depend on NPB device" 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 91e4e8ba..bfaccd78 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 @@ -28,7 +28,7 @@ - result_exec_setup_policy_log_nic_network.rc == 0 - result_exec_setup_policy_log_nic_network.failed == False fail_msg: "error:{{ result_exec_setup_policy_log_nic_network.stderr }},stdout:{{ result_exec_setup_policy_log_nic_network }}" - success_msg: "{{ result_exec_setup_policy_log_nic_network.stdout_lines[0] }}" + success_msg: "{{ result_exec_setup_policy_log_nic_network.stdout_lines }}" - name: "tsg-os-provision: obtain sn from mxn and write sn to tsg_sn.json" shell: /opt/tsg/tsg-os-provision/obtain_sn.sh 192.168.100.5 diff --git a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.9000NPBP01R01 index 114a53a0..99bb017b 100644 --- a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.9000NPBP01R01 +++ b/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.9000NPBP01R01 @@ -28,7 +28,7 @@ - result_exec_setup_policy_log_nic_network.rc == 0 - result_exec_setup_policy_log_nic_network.failed == False fail_msg: "error:{{ result_exec_setup_policy_log_nic_network.stderr }},stdout:{{ result_exec_setup_policy_log_nic_network }}" - success_msg: "{{ result_exec_setup_policy_log_nic_network.stdout_lines[0] }}" + success_msg: "{{ result_exec_setup_policy_log_nic_network.stdout_lines }}" - name: "tsg-os-provision: obtain sn" shell: /opt/tsg/tsg-os-provision/obtain_sn.sh 127.0.0.1 diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample b/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample index 14a3b2f8..eac87db1 100644 --- a/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample +++ b/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample @@ -42,22 +42,22 @@ tera_steering_group: vlan_id: 1301 keepalive: ipv4: 127.0.0.1/24 - ipv6: '\:\:1/64' + ipv6: 'fe80\:\:1/64' external: vlan_id: 1302 keepalive: ipv4: 127.0.0.1/24 - ipv6: '\:\:1/64' + ipv6: 'fe80\:\:2/64' - internal: vlan_id: 1201 keepalive: ipv4: 127.0.0.1/24 - ipv6: '\:\:1/64' + ipv6: 'fe80\:\:3/64' external: vlan_id: 1202 keepalive: ipv4: 127.0.0.1/24 - ipv6: '\:\:1/64' + ipv6: 'fe80\:\:4/64' inline_device_settings: keepalive: @@ -71,4 +71,4 @@ feature: network_setting: nic_policy_log: ipv4: 127.0.0.1/24 - ipv6: '\:\:1/64' \ No newline at end of file + ipv6: 'fe80\:\:5/64' \ No newline at end of file diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2 b/ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2 index eaffd6a3..f923442b 100644 --- a/ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2 +++ b/ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2 @@ -1,4 +1,4 @@ #!/bin/bash -ex ifconfig eth_ctl {{ network_setting.nic_policy_log.ipv4 }} -ifconfig eth_ctl {{ network_setting.nic_policy_log.ipv6 }} +ifconfig eth_ctl inet6 add {{ network_setting.nic_policy_log.ipv6 }}