openstack/tripleo-heat-templates
Code Issues Proposed changes

Replace all the bridge_name variables in templates

Browse Source 
The bridge_name might be used for multiple times, for example,
in different vlan configurations. All of them should be replaced with
the actual ${bridge_name} variable.

Change-Id: I93ee204a526422f113a88b99531583e3cf769382
Closes-Bug: #1866393
This commit is contained in:
Zhu Sheng Li 2020-03-20 19:53:41 +08:00
parent ebe1a40fb9
commit 47ca83280c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
network/scripts/run-os-net-config.sh
View File

@ -83,8 +83,8 @@ if [ -n '$network_config' ]; then
network_config_hook network_config_hook
fi fi
sed -i "s/: \"bridge_name/: \"${bridge_name:-''}/" /etc/os-net-config/config.json sed -i "s/: \"bridge_name/: \"${bridge_name:-''}/g" /etc/os-net-config/config.json
sed -i "s/interface_name/${interface_name:-''}/" /etc/os-net-config/config.json sed -i "s/interface_name/${interface_name:-''}/g" /etc/os-net-config/config.json
set +e set +e
os-net-config -c /etc/os-net-config/config.json -v --detailed-exit-codes os-net-config -c /etc/os-net-config/config.json -v --detailed-exit-codes