From fa4ece89f7928bc86b194b62f02304e805ae573b Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Thu, 25 Sep 2014 00:40:17 +0000 Subject: [PATCH] Remove Nova v3 API endpoint Nova v3 API has disappeared in Juno cycle, and we don't test the API now on the gate since If63dcdb2d05aa0fab0b6848a1248b6678f1ee9ad . This patch removes the endpoint of Nova v3 API. Change-Id: I85f87b37558a15d1eaaa781b02fec5b02bd2ab44 --- files/default_catalog.templates | 6 ------ lib/nova | 8 -------- lib/tempest | 3 --- 3 files changed, 17 deletions(-) diff --git a/files/default_catalog.templates b/files/default_catalog.templates index ff00e38e09..901635570b 100644 --- a/files/default_catalog.templates +++ b/files/default_catalog.templates @@ -12,12 +12,6 @@ catalog.RegionOne.compute.internalURL = http://%SERVICE_HOST%:8774/v2/$(tenant_i catalog.RegionOne.compute.name = Compute Service -catalog.RegionOne.computev3.publicURL = http://%SERVICE_HOST%:8774/v3 -catalog.RegionOne.computev3.adminURL = http://%SERVICE_HOST%:8774/v3 -catalog.RegionOne.computev3.internalURL = http://%SERVICE_HOST%:8774/v3 -catalog.RegionOne.computev3.name = Compute Service V3 - - catalog.RegionOne.volume.publicURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s catalog.RegionOne.volume.adminURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s catalog.RegionOne.volume.internalURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s diff --git a/lib/nova b/lib/nova index 2a3aae1835..88c1e29cea 100644 --- a/lib/nova +++ b/lib/nova @@ -349,14 +349,6 @@ create_nova_accounts() { "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2/\$(tenant_id)s" \ "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2/\$(tenant_id)s" \ "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2/\$(tenant_id)s" - - local nova_v3_service=$(get_or_create_service "novav3" \ - "computev3" "Nova Compute Service V3") - get_or_create_endpoint $nova_v3_service \ - "$REGION_NAME" \ - "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v3" \ - "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v3" \ - "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v3" fi fi diff --git a/lib/tempest b/lib/tempest index 906cb00f95..0dfeb868df 100644 --- a/lib/tempest +++ b/lib/tempest @@ -290,15 +290,12 @@ function configure_tempest { iniset $TEMPEST_CONFIG compute ssh_connect_method $ssh_connect_method # Compute Features - iniset $TEMPEST_CONFIG compute-feature-enabled api_v3 ${TEMPEST_NOVA_API_V3:-False} iniset $TEMPEST_CONFIG compute-feature-enabled resize True iniset $TEMPEST_CONFIG compute-feature-enabled live_migration ${LIVE_MIGRATION_AVAILABLE:-False} iniset $TEMPEST_CONFIG compute-feature-enabled change_password False iniset $TEMPEST_CONFIG compute-feature-enabled block_migration_for_live_migration ${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False} iniset $TEMPEST_CONFIG compute-feature-enabled api_extensions ${COMPUTE_API_EXTENSIONS:-"all"} iniset $TEMPEST_CONFIG compute-feature-disabled api_extensions ${DISABLE_COMPUTE_API_EXTENSIONS} - iniset $TEMPEST_CONFIG compute-feature-enabled api_v3_extensions ${COMPUTE_API_V3_EXTENSIONS:-"all"} - iniset $TEMPEST_CONFIG compute-feature-disabled api_v3_extensions ${DISABLE_COMPUTE_API_V3_EXTENSIONS} # Compute admin iniset $TEMPEST_CONFIG "compute-admin" username $ADMIN_USERNAME