Change default PUBLIC_NETWORK_NAME/DEFAULT_FLOATING_POOL name

This patch changes the default network name/floating pool from nova
to pubic as the name public makes more sense than nova for a public
network.

Change-Id: I4153750c08d1510dbad3051681e8c142a79fe1a1
This commit is contained in:
Aaron Rosen 2013-03-26 16:52:53 -07:00
parent a2ae90fa02
commit 640f1e4c8d
2 changed files with 2 additions and 2 deletions

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}

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}