openstack/devstack
Code Issues Proposed changes

Merge "add options to support nova test matrix"

Browse Source
This commit is contained in:
Jenkins 2015-09-03 05:22:15 +00:00 committed by Gerrit Code Review
commit 29baec4bdd
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/nova
View File

@ -64,6 +64,11 @@ NOVA_API_PASTE_INI=${NOVA_API_PASTE_INI:-$NOVA_CONF_DIR/api-paste.ini}
# Expect to remove in L or M. # Expect to remove in L or M.
NOVA_API_VERSION=${NOVA_API_VERSION-default} NOVA_API_VERSION=${NOVA_API_VERSION-default}
# NOVA_V2_LEGACY defines whether we force the Nova v2.0 enpoint onto
# the Nova v2.0 legacy code base. Remove this option once the Nova
# v2.0 legacy codebase is removed.
NOVA_V2_LEGACY=$(trueorfalse False NOVA_V2_LEGACY)
if is_suse; then if is_suse; then
NOVA_WSGI_DIR=${NOVA_WSGI_DIR:-/srv/www/htdocs/nova} NOVA_WSGI_DIR=${NOVA_WSGI_DIR:-/srv/www/htdocs/nova}
else else
@ -313,6 +318,13 @@ function configure_nova {
if [[ "$NOVA_API_VERSION" == "v21default" ]]; then if [[ "$NOVA_API_VERSION" == "v21default" ]]; then
sed -i s/": openstack_compute_api_v2$"/": openstack_compute_api_v21"/ "$NOVA_API_PASTE_INI" sed -i s/": openstack_compute_api_v2$"/": openstack_compute_api_v21"/ "$NOVA_API_PASTE_INI"
fi fi
# For setting up an environment where v2.0 is running on the
# v2.0 legacy code base.
if [[ "$NOVA_V2_LEGACY" == "True" ]]; then
sed -i s@"^/v2: openstack_compute_api_v21_legacy_v2_compatible$"@"/v2: openstack_compute_api_legacy_v2"@ \
"$NOVA_API_PASTE_INI"
fi
fi fi
if is_service_enabled n-cpu; then if is_service_enabled n-cpu; then
@ -413,15 +425,16 @@ function create_nova_accounts {
nova_api_url="$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST/compute" nova_api_url="$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST/compute"
fi fi
get_or_create_service "nova" "compute" "Nova Compute Service" get_or_create_service "nova_legacy" "compute_legacy" \
get_or_create_endpoint "compute" \ "Nova Compute Service (Legacy 2.0)"
get_or_create_endpoint "compute_legacy" \
"$REGION_NAME" \ "$REGION_NAME" \
"$nova_api_url/v2/\$(tenant_id)s" \ "$nova_api_url/v2/\$(tenant_id)s" \
"$nova_api_url/v2/\$(tenant_id)s" \ "$nova_api_url/v2/\$(tenant_id)s" \
"$nova_api_url/v2/\$(tenant_id)s" "$nova_api_url/v2/\$(tenant_id)s"
get_or_create_service "novav21" "computev21" "Nova Compute Service V2.1" get_or_create_service "nova" "compute" "Nova Compute Service"
get_or_create_endpoint "computev21" \ get_or_create_endpoint "compute" \
"$REGION_NAME" \ "$REGION_NAME" \
"$nova_api_url/v2.1/\$(tenant_id)s" \ "$nova_api_url/v2.1/\$(tenant_id)s" \
"$nova_api_url/v2.1/\$(tenant_id)s" \ "$nova_api_url/v2.1/\$(tenant_id)s" \

8
lib/tempest
View File

@ -361,6 +361,14 @@ function configure_tempest {
iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME
fi fi
# Set the service catalog entry for Tempest to run on. Typically
# used to try different compute API version targets. The tempest
# default if 'compute', which is typically valid, so only set this
# if you want to change it.
if [[ -n "$TEMPEST_COMPUTE_TYPE" ]]; then
iniset $TEMPEST_CONFIG compute catalog_type $TEMPEST_COMPUTE_TYPE
fi
# Compute Features # Compute Features
# Run ``verify_tempest_config -ur`` to retrieve enabled extensions on API endpoints # Run ``verify_tempest_config -ur`` to retrieve enabled extensions on API endpoints
# NOTE(mtreinish): This must be done after auth settings are added to the tempest config # NOTE(mtreinish): This must be done after auth settings are added to the tempest config