Merge "Reorder tenant_network to match Juno"

This commit is contained in:
Jenkins
2015-02-14 18:06:16 +00:00
committed by Gerrit Code Review

View File

@@ -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