openstack/devstack
Code Issues Proposed changes

Merge "Change default PUBLIC_NETWORK_NAME/DEFAULT_FLOATING_POOL name"

Browse Source
This commit is contained in:
Jenkins 2013-04-02 11:43:25 +00:00 committed by Gerrit Code Review
commit 24015ed40b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exercises/floating_ips.sh
View File

@ -48,7 +48,7 @@ DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ami}
SECGROUP=${SECGROUP:-test_secgroup} SECGROUP=${SECGROUP:-test_secgroup}
# Default floating IP pool name # Default floating IP pool name
DEFAULT_FLOATING_POOL=${DEFAULT_FLOATING_POOL:-nova} DEFAULT_FLOATING_POOL=${DEFAULT_FLOATING_POOL:-public}
# Additional floating IP pool and range # Additional floating IP pool and range
TEST_FLOATING_POOL=${TEST_FLOATING_POOL:-test} TEST_FLOATING_POOL=${TEST_FLOATING_POOL:-test}

2
stackrc
View File

@ -217,7 +217,7 @@ S3_SERVICE_PORT=${S3_SERVICE_PORT:-3333}
# Common network names # Common network names
PRIVATE_NETWORK_NAME=${PRIVATE_NETWORK_NAME:-"private"} PRIVATE_NETWORK_NAME=${PRIVATE_NETWORK_NAME:-"private"}
PUBLIC_NETWORK_NAME=${PUBLIC_NETWORK_NAME:-"nova"} PUBLIC_NETWORK_NAME=${PUBLIC_NETWORK_NAME:-"public"}
# Compatibility until it's eradicated from CI # Compatibility until it's eradicated from CI
USE_SCREEN=${SCREEN_DEV:-$USE_SCREEN} USE_SCREEN=${SCREEN_DEV:-$USE_SCREEN}