openstack/training-guides
Code Issues Proposed changes

Reorder tenant_network to match Juno

Browse Source 
Reorder tenant_network to match the Juno install-guide. No functional
changes.

Change-Id: Ia55ac7481e393dc1996ad37186bd0aea41981bde
This commit is contained in:
Roger Luethi
2015-01-02 15:40:11 +01:00
parent 224923df47
commit 77a0e046a4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
labs/scripts/config_tenant_network.sh
View File

@@ -4,16 +4,18 @@ TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
source "$TOP_DIR/config/paths" source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/credentials" source "$CONFIG_DIR/credentials"
source "$LIB_DIR/functions.guest" source "$LIB_DIR/functions.guest"
source "$CONFIG_DIR/demo-openstackrc.sh"
exec_logfile exec_logfile
indicate_current_auto indicate_current_auto
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Create tenant network # 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." echo "Waiting for neutron to start."
until neutron net-list >/dev/null 2>&1; do until neutron net-list >/dev/null 2>&1; do
sleep 1 sleep 1