fix-gate: change trove auth URL's to reflect new URL settings

Trove's code was setup to use :5000 and :35357 for keystone's auth end
points. Change that to reflect the new settings that are /identity/
and /identity_admin/. See also [1]

[1] https://review.openstack.org/#/c/456344/

Change-Id: I3d6f6649430ee40879de15fee0b215dc32e8b666
Related: I46294fb24e3c23fa19fcfd7d6c9ee8a932354702

5 files changed, 8 insertions, 8 deletions

diff --git a/etc/trove/api-paste.ini.test b/etc/trove/api-paste.ini.test
index f2b0bc08..de24321a 100644
--- a/etc/trove/api-paste.ini.test
+++ b/etc/trove/api-paste.ini.test
@@ -21,7 +21,7 @@ service_port = 5000
 auth_host = 127.0.0.1
 auth_port = 35357
 auth_protocol = http
-auth_uri = http://127.0.0.1:5000/
+auth_uri = http://127.0.0.1/identity/
 signing_dir = /tmp/keystone-signing-trove
 
 [filter:authorization]
diff --git a/etc/trove/trove-conductor.conf.sample b/etc/trove/trove-conductor.conf.sample
index 964303ea..8a1f8283 100644
--- a/etc/trove/trove-conductor.conf.sample
+++ b/etc/trove/trove-conductor.conf.sample
@@ -1,6 +1,6 @@
 [DEFAULT]
 debug = True
-trove_auth_url = http://0.0.0.0:5000/v2.0
+trove_auth_url = http://0.0.0.0/identity/v2.0
 
 # The manager class to use for conductor. (string value)
 conductor_manager = trove.conductor.manager.Manager
diff --git a/etc/trove/trove-taskmanager.conf.sample b/etc/trove/trove-taskmanager.conf.sample
index 69a64ff2..03f619dc 100644
--- a/etc/trove/trove-taskmanager.conf.sample
+++ b/etc/trove/trove-taskmanager.conf.sample
@@ -27,7 +27,7 @@ control_exchange = trove
 db_api_implementation = trove.db.sqlalchemy.api
 
 # Configuration options for talking to nova via the novaclient.
-trove_auth_url = http://0.0.0.0:5000/v2.0
+trove_auth_url = http://0.0.0.0/identity/v2.0
 #nova_compute_url = http://localhost:8774/v2
 #cinder_url = http://localhost:8776/v1
 #swift_url = http://localhost:8080/v1/AUTH_
@@ -82,7 +82,7 @@ notification_service_id = mysql:2f3ff068-2bfb-4f70-9a9d-a6bb65bc084b
 # Trove DNS
 trove_dns_support = False
 dns_account_id = 123456
-dns_auth_url = http://127.0.0.1:5000/v2.0
+dns_auth_url = http://127.0.0.1/identity/v2.0
 dns_username = user
 dns_passkey = password
 dns_ttl = 3600
diff --git a/etc/trove/trove.conf.sample b/etc/trove/trove.conf.sample
index a64f7522..054d63bd 100644
--- a/etc/trove/trove.conf.sample
+++ b/etc/trove/trove.conf.sample
@@ -37,7 +37,7 @@ control_exchange = trove
 db_api_implementation = "trove.db.sqlalchemy.api"
 
 # Configuration options for talking to nova via the novaclient.
-trove_auth_url = http://0.0.0.0:5000/v2.0
+trove_auth_url = http://0.0.0.0/identity/v2.0
 #nova_compute_url = http://localhost:8774/v2
 #cinder_url = http://localhost:8776/v1
 #swift_url = http://localhost:8080/v1/AUTH_
@@ -92,7 +92,7 @@ http_mgmt_post_rate = 200
 # Trove DNS
 trove_dns_support = False
 dns_account_id = 123456
-dns_auth_url = http://127.0.0.1:5000/v2.0
+dns_auth_url = http://127.0.0.1/identity/v2.0
 dns_username = user
 dns_passkey = password
 dns_ttl = 3600
diff --git a/etc/trove/trove.conf.test b/etc/trove/trove.conf.test
index e22b4c0b..65ef0a03 100644
--- a/etc/trove/trove.conf.test
+++ b/etc/trove/trove.conf.test
@@ -48,7 +48,7 @@ db_api_implementation = trove.db.sqlalchemy.api
 nova_proxy_admin_user = admin
 nova_proxy_admin_pass = 3de4922d8b6ac5a1aad9
 nova_proxy_admin_tenant_id =
-trove_auth_url = http://0.0.0.0:5000/v2.0
+trove_auth_url = http://0.0.0.0/identity/v2.0
 
 os_region_name = RegionOne
 nova_compute_service_type = compute
@@ -182,7 +182,7 @@ service_port = 5000
 auth_host = 127.0.0.1
 auth_port = 35357
 auth_protocol = http
-auth_uri = http://127.0.0.1:5000/
+auth_uri = http://127.0.0.1/identity/
 
 [filter:authorization]
 paste.filter_factory = trove.common.auth:AuthorizationMiddleware.factory