openstack/trove
Code Issues Proposed changes

fix build: identity_admin is no longer available in CI

Browse Source 
Trove's test setup used identity_admin to get to keystone. This no
longer exists in the CI.

Change-Id: I6dc2e620631e124c7c69b45c6702da1cfaf091c2
Closes-Bug: 1688063
This commit is contained in:
Amrith Kumar 2017-05-03 15:19:24 -04:00
parent b0a45c0962
commit 7eb6bdc80d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration/scripts/conf/test_begin.conf
View File

@ -1,14 +1,14 @@
{ {
"dbaas_url":"http://%service_host%:8779/v1.0", "dbaas_url":"http://%service_host%:8779/v1.0",
"version_url":"http://%service_host%:8779", "version_url":"http://%service_host%:8779",
"trove_auth_url":"http://%service_host%/identity_admin/v2.0/tokens", "trove_auth_url":"http://%service_host%/identity/v2.0/tokens",
"trove_client_insecure":false, "trove_client_insecure":false,
"auth_strategy":null, "auth_strategy":null,
"trove_client_region_name": "%region_name%", "trove_client_region_name": "%region_name%",
"nova_client": { "nova_client": {
"url":"http://%service_host%:8774/v1.1", "url":"http://%service_host%:8774/v1.1",
"auth_url":"http://%service_host%/identity_admin/v2.0", "auth_url":"http://%service_host%/identity/v2.0",
"nova_service_type":"compute", "nova_service_type":"compute",
"volume_service_type":"volume" "volume_service_type":"volume"
}, },

2
integration/scripts/trovestack
View File

@ -1062,7 +1062,7 @@ function cmd_example_tests() {
echo " echo "
{ {
\"directory\": \"$TROVESTACK_TESTS/../apidocs/src/resources/samples/\", \"directory\": \"$TROVESTACK_TESTS/../apidocs/src/resources/samples/\",
\"auth_url\":\"http://$KEYSTONE_AUTH_HOST/identity_admin/v2.0/tokens\", \"auth_url\":\"http://$KEYSTONE_AUTH_HOST/identity/v2.0/tokens\",
\"api_url\":\"http://$SERVICE_HOST:8779\", \"api_url\":\"http://$SERVICE_HOST:8779\",
\"replace_host\":\"https://ord.databases.api.rackspacecloud.com\", \"replace_host\":\"https://ord.databases.api.rackspacecloud.com\",
\"replace_dns_hostname\": \"e09ad9a3f73309469cf1f43d11e79549caf9acf2.rackspaceclouddb.com\", \"replace_dns_hostname\": \"e09ad9a3f73309469cf1f43d11e79549caf9acf2.rackspaceclouddb.com\",