From 640f1e4c8d0da6de70e358f5bad28fb1b0306e0d Mon Sep 17 00:00:00 2001 From: Aaron Rosen Date: Tue, 26 Mar 2013 16:52:53 -0700 Subject: [PATCH] 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 --- exercises/floating_ips.sh | 2 +- stackrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/floating_ips.sh b/exercises/floating_ips.sh index b4e1c423e6..ad11a6b793 100755 --- a/exercises/floating_ips.sh +++ b/exercises/floating_ips.sh @@ -48,7 +48,7 @@ DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ami} SECGROUP=${SECGROUP:-test_secgroup} # 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 TEST_FLOATING_POOL=${TEST_FLOATING_POOL:-test} diff --git a/stackrc b/stackrc index f35cdc07fb..5f8b6ef8a5 100644 --- a/stackrc +++ b/stackrc @@ -217,7 +217,7 @@ S3_SERVICE_PORT=${S3_SERVICE_PORT:-3333} # Common network names 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 USE_SCREEN=${SCREEN_DEV:-$USE_SCREEN}