From 5194f4181b2d9b4caffc85d5873ecf1143f972a1 Mon Sep 17 00:00:00 2001
From: Vasyl Saienko <vsaienko@mirantis.com>
Date: Fri, 2 Sep 2016 22:56:28 +0300
Subject: [PATCH] Fix setting custom IRONIC_VM_NETWORK_BRIDGE

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

Change-Id: I934e5604fc1850007fb55bc637fe449ac17b98d0
---
 devstack/lib/ironic                            | 2 +-
 devstack/tools/ironic/scripts/setup-network.sh | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 45fdcecc30..d1b5b7de52 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -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"
 
diff --git a/devstack/tools/ironic/scripts/setup-network.sh b/devstack/tools/ironic/scripts/setup-network.sh
index 8ed3f321d8..fc60da0820 100755
--- a/devstack/tools/ironic/scripts/setup-network.sh
+++ b/devstack/tools/ironic/scripts/setup-network.sh
@@ -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"