Merge "Change default PUBLIC_NETWORK_NAME/DEFAULT_FLOATING_POOL name"
diff --git a/exercises/floating_ips.sh b/exercises/floating_ips.sh
index b4e1c42..ad11a6b 100755
--- a/exercises/floating_ips.sh
+++ b/exercises/floating_ips.sh
@@ -48,7 +48,7 @@
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 5a4c580..7c4fa68 100644
--- a/stackrc
+++ b/stackrc
@@ -217,7 +217,7 @@
# 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}