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

bugfix:修改配置ipv6地址命令和修改stdout_lines[0]不存在导致tsg-os-provision启动失败问题

Browse Source
This commit is contained in:
fumingwei
2021-06-24 16:08:49 +08:00
parent 2a424f3a84
commit 48bf3b1be2
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

2
ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.9000NPBP01R01
View File

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

10
ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample
View File

@@ -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'
ipv6: 'fe80\:\:5/64'

2
ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2
View File

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