From b0565fa5ea71d5fa3aca4e10681483aa8469220b Mon Sep 17 00:00:00 2001 From: Mathieu Mitchell Date: Tue, 21 Jun 2016 23:46:45 -0400 Subject: [PATCH] Use PRIVATE_NETWORK_NAME for devstack plugin The devstack plugin hardcodes "private" for the default cleaning network and when looking up the network to bind onto for IPA-conductor communication. Ensure we are using the devstack PRIVATE_NETWORK_NAME variable instead of hardcoding the commonly used name. Change-Id: I6f344edc75ad1e2ac29bd59a9804ab3cad6cf2b2 Partial-bug: #1595598 --- devstack/lib/ironic | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 97f04da8c1..c1441fca85 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -118,7 +118,7 @@ IRONIC_VM_NETWORK_BRIDGE=${IRONIC_VM_NETWORK_BRIDGE:-brbm} IRONIC_VM_NETWORK_RANGE=${IRONIC_VM_NETWORK_RANGE:-192.0.2.0/24} IRONIC_VM_MACS_CSV_FILE=${IRONIC_VM_MACS_CSV_FILE:-$IRONIC_DATA_DIR/ironic_macs.csv} IRONIC_AUTHORIZED_KEYS_FILE=${IRONIC_AUTHORIZED_KEYS_FILE:-$HOME/.ssh/authorized_keys} -IRONIC_CLEAN_NET_NAME=${IRONIC_CLEAN_NET_NAME:-private} +IRONIC_CLEAN_NET_NAME=${IRONIC_CLEAN_NET_NAME:-$PRIVATE_NETWORK_NAME} IRONIC_EXTRA_PXE_PARAMS=${IRONIC_EXTRA_PXE_PARAMS:-} IRONIC_TTY_DEV=${IRONIC_TTY_DEV:-ttyS0} @@ -749,7 +749,7 @@ function create_bridge_and_vms { vbmc_port=$((vbmc_port+1)) done local ironic_net_id - ironic_net_id=$(openstack network show "private" -c id -f value) + ironic_net_id=$(openstack network show "$PRIVATE_NETWORK_NAME" -c id -f value) create_ovs_taps $ironic_net_id }