Browse code
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
Ken'ichi Ohmichi authored on 2014/09/25 09:40:17Showing 3 changed files
| ... | ... |
@@ -12,12 +12,6 @@ catalog.RegionOne.compute.internalURL = http://%SERVICE_HOST%:8774/v2/$(tenant_i |
| 12 | 12 |
catalog.RegionOne.compute.name = Compute Service |
| 13 | 13 |
|
| 14 | 14 |
|
| 15 |
-catalog.RegionOne.computev3.publicURL = http://%SERVICE_HOST%:8774/v3 |
|
| 16 |
-catalog.RegionOne.computev3.adminURL = http://%SERVICE_HOST%:8774/v3 |
|
| 17 |
-catalog.RegionOne.computev3.internalURL = http://%SERVICE_HOST%:8774/v3 |
|
| 18 |
-catalog.RegionOne.computev3.name = Compute Service V3 |
|
| 19 |
- |
|
| 20 |
- |
|
| 21 | 15 |
catalog.RegionOne.volume.publicURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s |
| 22 | 16 |
catalog.RegionOne.volume.adminURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s |
| 23 | 17 |
catalog.RegionOne.volume.internalURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s |
| ... | ... |
@@ -349,14 +349,6 @@ create_nova_accounts() {
|
| 349 | 349 |
"$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2/\$(tenant_id)s" \ |
| 350 | 350 |
"$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2/\$(tenant_id)s" \ |
| 351 | 351 |
"$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v2/\$(tenant_id)s" |
| 352 |
- |
|
| 353 |
- local nova_v3_service=$(get_or_create_service "novav3" \ |
|
| 354 |
- "computev3" "Nova Compute Service V3") |
|
| 355 |
- get_or_create_endpoint $nova_v3_service \ |
|
| 356 |
- "$REGION_NAME" \ |
|
| 357 |
- "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v3" \ |
|
| 358 |
- "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v3" \ |
|
| 359 |
- "$NOVA_SERVICE_PROTOCOL://$NOVA_SERVICE_HOST:$NOVA_SERVICE_PORT/v3" |
|
| 360 | 352 |
fi |
| 361 | 353 |
fi |
| 362 | 354 |
|
| ... | ... |
@@ -290,15 +290,12 @@ function configure_tempest {
|
| 290 | 290 |
iniset $TEMPEST_CONFIG compute ssh_connect_method $ssh_connect_method |
| 291 | 291 |
|
| 292 | 292 |
# Compute Features |
| 293 |
- iniset $TEMPEST_CONFIG compute-feature-enabled api_v3 ${TEMPEST_NOVA_API_V3:-False}
|
|
| 294 | 293 |
iniset $TEMPEST_CONFIG compute-feature-enabled resize True |
| 295 | 294 |
iniset $TEMPEST_CONFIG compute-feature-enabled live_migration ${LIVE_MIGRATION_AVAILABLE:-False}
|
| 296 | 295 |
iniset $TEMPEST_CONFIG compute-feature-enabled change_password False |
| 297 | 296 |
iniset $TEMPEST_CONFIG compute-feature-enabled block_migration_for_live_migration ${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False}
|
| 298 | 297 |
iniset $TEMPEST_CONFIG compute-feature-enabled api_extensions ${COMPUTE_API_EXTENSIONS:-"all"}
|
| 299 | 298 |
iniset $TEMPEST_CONFIG compute-feature-disabled api_extensions ${DISABLE_COMPUTE_API_EXTENSIONS}
|
| 300 |
- iniset $TEMPEST_CONFIG compute-feature-enabled api_v3_extensions ${COMPUTE_API_V3_EXTENSIONS:-"all"}
|
|
| 301 |
- iniset $TEMPEST_CONFIG compute-feature-disabled api_v3_extensions ${DISABLE_COMPUTE_API_V3_EXTENSIONS}
|
|
| 302 | 299 |
|
| 303 | 300 |
# Compute admin |
| 304 | 301 |
iniset $TEMPEST_CONFIG "compute-admin" username $ADMIN_USERNAME |