Browse code
Merge "Fix NOVA_API_VERSION option"
Jenkins authored on 2014/12/05 16:46:58Showing 1 changed files
| ... | ... |
@@ -45,12 +45,12 @@ NOVA_FAKE_CONF=$NOVA_CONF_DIR/nova-fake.conf |
| 45 | 45 |
NOVA_CELLS_DB=${NOVA_CELLS_DB:-nova_cell}
|
| 46 | 46 |
|
| 47 | 47 |
NOVA_API_PASTE_INI=${NOVA_API_PASTE_INI:-$NOVA_CONF_DIR/api-paste.ini}
|
| 48 |
-# NOVA_API_VERSIONS valid options |
|
| 48 |
+# NOVA_API_VERSION valid options |
|
| 49 | 49 |
# - default - setup API end points as nova does out of the box |
| 50 | 50 |
# - v21default - make v21 the default on /v2 |
| 51 | 51 |
# NOTE(sdague): this is for transitional testing of the Nova v21 API. |
| 52 | 52 |
# Expect to remove in L or M. |
| 53 |
-NOVA_API_VERSIONS=${NOVA_API_VERSIONS:-default}
|
|
| 53 |
+NOVA_API_VERSION=${NOVA_API_VERSION-default}
|
|
| 54 | 54 |
|
| 55 | 55 |
if is_ssl_enabled_service "nova" || is_service_enabled tls-proxy; then |
| 56 | 56 |
NOVA_SERVICE_PROTOCOL="https" |