openstack/ironic
Code Issues Proposed changes

Fix setting custom IRONIC_VM_NETWORK_BRIDGE

Browse Source 
Pass IRONIC_VM_NETWORK_BRIDGE to setup-network.sh script.
Update setup-network.sh script to use new bridge name.

Change-Id: I934e5604fc1850007fb55bc637fe449ac17b98d0
This commit is contained in:
Vasyl Saienko 2016-09-02 22:56:28 +03:00
parent 446b3de468
commit 5194f4181b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/ironic
View File

@ -955,7 +955,7 @@ function setup_qemu_log_hook {
function create_bridge_and_vms {
# Call libvirt setup scripts in a new shell to ensure any new group membership
sudo su $STACK_USER -c "$IRONIC_SCRIPTS_DIR/setup-network.sh"
sudo su $STACK_USER -c "$IRONIC_SCRIPTS_DIR/setup-network.sh $IRONIC_VM_NETWORK_BRIDGE"
if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] ; then
local log_arg="-l $IRONIC_VM_LOG_DIR"

3
devstack/tools/ironic/scripts/setup-network.sh
View File

@ -11,8 +11,7 @@ LIBVIRT_CONNECT_URI=${LIBVIRT_CONNECT_URI:-"qemu:///system"}
# Keep track of the DevStack directory
TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
BRIDGE_SUFFIX=${1:-''}
BRIDGE_NAME=brbm$BRIDGE_SUFFIX
BRIDGE_NAME=${1:-brbm}
export VIRSH_DEFAULT_CONNECT_URI="$LIBVIRT_CONNECT_URI"