openstack/devstack
Code Issues Proposed changes

Merge "bug 985905: multi_host flag cunfusing settings"

Browse Source
This commit is contained in:
Jenkins 2012-05-10 19:26:20 +00:00 committed by Gerrit Code Review
commit 4415164d2f
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
exercises/floating_ips.sh
View File

@ -121,8 +121,8 @@ IP=`nova show $VM_UUID | grep "private network" | get_field 2`
die_if_not_set IP "Failure retrieving IP address" die_if_not_set IP "Failure retrieving IP address"
# for single node deployments, we can ping private ips # for single node deployments, we can ping private ips
MULTI_HOST=${MULTI_HOST:-0} MULTI_HOST=`trueorfalse False $MULTI_HOST`
if [ "$MULTI_HOST" = "0" ]; then if [ "$MULTI_HOST" = "False" ]; then
# sometimes the first ping fails (10 seconds isn't enough time for the VM's # sometimes the first ping fails (10 seconds isn't enough time for the VM's
# network to respond?), so let's ping for a default of 15 seconds with a # network to respond?), so let's ping for a default of 15 seconds with a
# timeout of a second for each ping. # timeout of a second for each ping.

4
exercises/quantum.sh
View File

@ -255,8 +255,8 @@ function ping_vms {
export OS_PASSWORD=nova export OS_PASSWORD=nova
PUBLIC_IP2=`nova show $VM_UUID2 | grep public-net1 | awk '{print $5}'` PUBLIC_IP2=`nova show $VM_UUID2 | grep public-net1 | awk '{print $5}'`
MULTI_HOST=${MULTI_HOST:-0} MULTI_HOST=`trueorfalse False $MULTI_HOST`
if [ "$MULTI_HOST" = "0" ]; then if [ "$MULTI_HOST" = "False" ]; then
# sometimes the first ping fails (10 seconds isn't enough time for the VM's # sometimes the first ping fails (10 seconds isn't enough time for the VM's
# network to respond?), so let's ping for a default of 15 seconds with a # network to respond?), so let's ping for a default of 15 seconds with a
# timeout of a second for each ping. # timeout of a second for each ping.

4
exercises/volumes.sh
View File

@ -97,8 +97,8 @@ IP=`nova show $VM_UUID | grep "private network" | get_field 2`
die_if_not_set IP "Failure retrieving IP address" die_if_not_set IP "Failure retrieving IP address"
# for single node deployments, we can ping private ips # for single node deployments, we can ping private ips
MULTI_HOST=${MULTI_HOST:-0} MULTI_HOST=`trueorfalse False $MULTI_HOST`
if [ "$MULTI_HOST" = "0" ]; then if [ "$MULTI_HOST" = "False" ]; then
# sometimes the first ping fails (10 seconds isn't enough time for the VM's # sometimes the first ping fails (10 seconds isn't enough time for the VM's
# network to respond?), so let's ping for a default of 15 seconds with a # network to respond?), so let's ping for a default of 15 seconds with a
# timeout of a second for each ping. # timeout of a second for each ping.

2
stack.sh
View File

@ -341,7 +341,7 @@ TEST_FLOATING_RANGE=${TEST_FLOATING_RANGE:-192.168.253.0/29}
# **MULTI_HOST** is a mode where each compute node runs its own network node. This # **MULTI_HOST** is a mode where each compute node runs its own network node. This
# allows network operations and routing for a VM to occur on the server that is # allows network operations and routing for a VM to occur on the server that is
# running the VM - removing a SPOF and bandwidth bottleneck. # running the VM - removing a SPOF and bandwidth bottleneck.
MULTI_HOST=${MULTI_HOST:-False} MULTI_HOST=`trueorfalse False $MULTI_HOST`
# If you are using FlatDHCP on multiple hosts, set the ``FLAT_INTERFACE`` # If you are using FlatDHCP on multiple hosts, set the ``FLAT_INTERFACE``
# variable but make sure that the interface doesn't already have an # variable but make sure that the interface doesn't already have an