From 77a0e046a4b8b772a0f0b73a30e55def19a3691b Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Fri, 2 Jan 2015 15:40:11 +0100 Subject: [PATCH] Reorder tenant_network to match Juno Reorder tenant_network to match the Juno install-guide. No functional changes. Change-Id: Ia55ac7481e393dc1996ad37186bd0aea41981bde --- labs/scripts/config_tenant_network.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/labs/scripts/config_tenant_network.sh b/labs/scripts/config_tenant_network.sh index b811e211..eea61dc7 100755 --- a/labs/scripts/config_tenant_network.sh +++ b/labs/scripts/config_tenant_network.sh @@ -4,16 +4,18 @@ TOP_DIR=$(cd $(dirname "$0")/.. && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" -source "$CONFIG_DIR/demo-openstackrc.sh" exec_logfile indicate_current_auto #------------------------------------------------------------------------------ # Create tenant network -# http://docs.openstack.org/icehouse/install-guide/install/apt/content/neutron_initial-tenant-network.html +# http://docs.openstack.org/juno/install-guide/install/apt/content/neutron_initial-tenant-network.html #------------------------------------------------------------------------------ +echo "Sourcing the demo credentials." +source "$CONFIG_DIR/demo-openstackrc.sh" + echo "Waiting for neutron to start." until neutron net-list >/dev/null 2>&1; do sleep 1