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

bugfix:删除nic_policy_log的ipv6配置项

Browse Source
This commit is contained in:
fumingwei
2021-09-14 12:00:28 +08:00
parent 93a2033512
commit 32c300c2cc
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01
View File

@@ -84,7 +84,6 @@ inline_device_settings:
network_setting:
nic_policy_log:
ipv4: 127.0.0.1/24
ipv6: 'fe80\:\:5/64'
gateway_ipv4: 192.168.1.1
coredump:

1
ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN123P01R01
View File

@@ -25,7 +25,6 @@ olap:
network_setting:
nic_policy_log:
ipv4: 127.0.0.1/24
ipv6: 'fe80\:\:5/64'
gateway_ipv4: 192.168.1.1
coredump:

12
ansible/roles/tsg-os-provision/files/network_settings/setup_policy_log_nic_network.sh.j2
View File

@@ -15,9 +15,9 @@ if [ $status_route_add_ipv4 -ne 7 ] && [ $status_route_add_ipv4 -ne 0 ]; then
exit $status_route_add_ipv4
fi
ifconfig eth_ctl inet6 add {{ network_setting.nic_policy_log.ipv6 }}
status_address_add_ipv6=$?
if [ $status_address_add_ipv6 -ne 0 ] && [ $status_address_add_ipv6 -ne 1 ]; then
echo "Fail to add ipv6 address to eth_ctl,return code:${status_address_add_ipv6}"
exit $status_address_add_ipv6
fi
#ifconfig eth_ctl inet6 add {{ network_setting.nic_policy_log.ipv6 }}
#status_address_add_ipv6=$?
#if [ $status_address_add_ipv6 -ne 0 ] && [ $status_address_add_ipv6 -ne 1 ]; then
# echo "Fail to add ipv6 address to eth_ctl,return code:${status_address_add_ipv6}"
# exit $status_address_add_ipv6
#fi