Browse code
Merge "Change default PUBLIC_NETWORK_NAME/DEFAULT_FLOATING_POOL name"
Jenkins authored on 2013/04/02 20:43:25Showing 2 changed files
| ... | ... |
@@ -48,7 +48,7 @@ DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ami}
|
| 48 | 48 |
SECGROUP=${SECGROUP:-test_secgroup}
|
| 49 | 49 |
|
| 50 | 50 |
# Default floating IP pool name |
| 51 |
-DEFAULT_FLOATING_POOL=${DEFAULT_FLOATING_POOL:-nova}
|
|
| 51 |
+DEFAULT_FLOATING_POOL=${DEFAULT_FLOATING_POOL:-public}
|
|
| 52 | 52 |
|
| 53 | 53 |
# Additional floating IP pool and range |
| 54 | 54 |
TEST_FLOATING_POOL=${TEST_FLOATING_POOL:-test}
|
| ... | ... |
@@ -217,7 +217,7 @@ S3_SERVICE_PORT=${S3_SERVICE_PORT:-3333}
|
| 217 | 217 |
|
| 218 | 218 |
# Common network names |
| 219 | 219 |
PRIVATE_NETWORK_NAME=${PRIVATE_NETWORK_NAME:-"private"}
|
| 220 |
-PUBLIC_NETWORK_NAME=${PUBLIC_NETWORK_NAME:-"nova"}
|
|
| 220 |
+PUBLIC_NETWORK_NAME=${PUBLIC_NETWORK_NAME:-"public"}
|
|
| 221 | 221 |
|
| 222 | 222 |
# Compatibility until it's eradicated from CI |
| 223 | 223 |
USE_SCREEN=${SCREEN_DEV:-$USE_SCREEN}
|