Merge "Fix NOVA_API_VERSION option"

This commit is contained in:
Jenkins 2014-12-05 07:46:58 +00:00 committed by Gerrit Code Review
commit 129166c2d9

View File

@ -45,12 +45,12 @@ NOVA_FAKE_CONF=$NOVA_CONF_DIR/nova-fake.conf
NOVA_CELLS_DB=${NOVA_CELLS_DB:-nova_cell}
NOVA_API_PASTE_INI=${NOVA_API_PASTE_INI:-$NOVA_CONF_DIR/api-paste.ini}
# NOVA_API_VERSIONS valid options
# NOVA_API_VERSION valid options
# - default - setup API end points as nova does out of the box
# - v21default - make v21 the default on /v2
# NOTE(sdague): this is for transitional testing of the Nova v21 API.
# Expect to remove in L or M.
NOVA_API_VERSIONS=${NOVA_API_VERSIONS:-default}
NOVA_API_VERSION=${NOVA_API_VERSION-default}
if is_ssl_enabled_service "nova" || is_service_enabled tls-proxy; then
NOVA_SERVICE_PROTOCOL="https"