openstack/tripleo-heat-templates
Code Issues Proposed changes

net-conf: make bridge and interface name optional

Browse Source 
Update the run-os-net-config.sh so that we make the
bridge_name and interface_name parameters (supplied by
the SoftwareConfig) optional. This allows operators to
create custom network templates to be used on roles other than
compute and controller which appear to be the only two roles which
set bridge_name and interface_name parameters.

Change-Id: I8997cf8177c1bf0e1f19de5f93dc4e81da1a951f
This commit is contained in:
Dan Prince 2016-12-17 09:46:03 -05:00
parent 713a0326e4
commit c6f4d5bf90
1 changed files with 5 additions and 5 deletions

10
network/scripts/run-os-net-config.sh

@ -1,7 +1,7 @@
#!/bin/bash
# Note this script expects the following environment variables to be set
# normally these are provided by the calling SoftwareConfig resource, but
# they may also be set manually for testing
# The following environment variables may be set to substitute in a
# custom bridge or interface name. Normally these are provided by the calling
# SoftwareConfig resource, but they may also be set manually for testing.
# $bridge_name : The bridge device name to apply
# $interface_name : The interface name to apply
#
@ -113,8 +113,8 @@ if [ -n '$network_config' ]; then
mkdir -p /etc/os-net-config
# Note these variables come from the calling heat SoftwareConfig
echo '$network_config' > /etc/os-net-config/config.json
sed -i "s/bridge_name/$bridge_name/" /etc/os-net-config/config.json
sed -i "s/interface_name/$interface_name/" /etc/os-net-config/config.json
sed -i "s/bridge_name/${bridge_name:-''}/" /etc/os-net-config/config.json
sed -i "s/interface_name/${interface_name:-''}/" /etc/os-net-config/config.json
os-net-config -c /etc/os-net-config/config.json -v --detailed-exit-codes
RETVAL=$?