openstack/trove
Code Issues Proposed changes

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

Browse Source 
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
This commit is contained in:
Amrith Kumar 2017-04-19 10:15:36 -04:00 committed by Amrith Kumar
parent e8686f1d24
commit 191e3036e1
12 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/plugin.sh
View File

@ -160,6 +160,8 @@ function configure_trove {
rm -f $TROVE_TASKMANAGER_CONF rm -f $TROVE_TASKMANAGER_CONF
rm -f $TROVE_CONDUCTOR_CONF rm -f $TROVE_CONDUCTOR_CONF
TROVE_AUTH_ENDPOINT=$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION
# (Re)create trove api conf file if needed # (Re)create trove api conf file if needed
if is_service_enabled tr-api; then if is_service_enabled tr-api; then
# Set common configuration values (but only if they're defined) # Set common configuration values (but only if they're defined)
@ -180,12 +182,11 @@ function configure_trove {
iniset $TROVE_CONF DEFAULT trove_api_workers "$API_WORKERS" iniset $TROVE_CONF DEFAULT trove_api_workers "$API_WORKERS"
configure_auth_token_middleware $TROVE_CONF trove $TROVE_AUTH_CACHE_DIR configure_auth_token_middleware $TROVE_CONF trove $TROVE_AUTH_CACHE_DIR
iniset $TROVE_CONF DEFAULT trove_auth_url $TROVE_AUTH_ENDPOINT
fi fi
# (Re)create trove taskmanager conf file if needed # (Re)create trove taskmanager conf file if needed
if is_service_enabled tr-tmgr; then if is_service_enabled tr-tmgr; then
TROVE_AUTH_ENDPOINT=$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION
# Use these values only if they're set # Use these values only if they're set
iniset_conditional $TROVE_TASKMANAGER_CONF DEFAULT agent_call_low_timeout $TROVE_AGENT_CALL_LOW_TIMEOUT iniset_conditional $TROVE_TASKMANAGER_CONF DEFAULT agent_call_low_timeout $TROVE_AGENT_CALL_LOW_TIMEOUT
iniset_conditional $TROVE_TASKMANAGER_CONF DEFAULT agent_call_high_timeout $TROVE_AGENT_CALL_HIGH_TIMEOUT iniset_conditional $TROVE_TASKMANAGER_CONF DEFAULT agent_call_high_timeout $TROVE_AGENT_CALL_HIGH_TIMEOUT

2
etc/trove/api-paste.ini.test
View File

@ -21,7 +21,7 @@ service_port = 5000
auth_host = 127.0.0.1 auth_host = 127.0.0.1
auth_port = 35357 auth_port = 35357
auth_protocol = http 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 signing_dir = /tmp/keystone-signing-trove
[filter:authorization] [filter:authorization]

2
etc/trove/trove-conductor.conf.sample
View File

@ -1,6 +1,6 @@
[DEFAULT] [DEFAULT]
debug = True 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) # The manager class to use for conductor. (string value)
conductor_manager = trove.conductor.manager.Manager conductor_manager = trove.conductor.manager.Manager

4
etc/trove/trove-taskmanager.conf.sample
View File

@ -27,7 +27,7 @@ control_exchange = trove
db_api_implementation = trove.db.sqlalchemy.api db_api_implementation = trove.db.sqlalchemy.api
# Configuration options for talking to nova via the novaclient. # 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 #nova_compute_url = http://localhost:8774/v2
#cinder_url = http://localhost:8776/v1 #cinder_url = http://localhost:8776/v1
#swift_url = http://localhost:8080/v1/AUTH_ #swift_url = http://localhost:8080/v1/AUTH_
@ -82,7 +82,7 @@ notification_service_id = mysql:2f3ff068-2bfb-4f70-9a9d-a6bb65bc084b
# Trove DNS # Trove DNS
trove_dns_support = False trove_dns_support = False
dns_account_id = 123456 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_username = user
dns_passkey = password dns_passkey = password
dns_ttl = 3600 dns_ttl = 3600

4
etc/trove/trove.conf.sample
View File

@ -37,7 +37,7 @@ control_exchange = trove
db_api_implementation = "trove.db.sqlalchemy.api" db_api_implementation = "trove.db.sqlalchemy.api"
# Configuration options for talking to nova via the novaclient. # 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 #nova_compute_url = http://localhost:8774/v2
#cinder_url = http://localhost:8776/v1 #cinder_url = http://localhost:8776/v1
#swift_url = http://localhost:8080/v1/AUTH_ #swift_url = http://localhost:8080/v1/AUTH_
@ -92,7 +92,7 @@ http_mgmt_post_rate = 200
# Trove DNS # Trove DNS
trove_dns_support = False trove_dns_support = False
dns_account_id = 123456 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_username = user
dns_passkey = password dns_passkey = password
dns_ttl = 3600 dns_ttl = 3600

4
etc/trove/trove.conf.test
View File

@ -48,7 +48,7 @@ db_api_implementation = trove.db.sqlalchemy.api
nova_proxy_admin_user = admin nova_proxy_admin_user = admin
nova_proxy_admin_pass = 3de4922d8b6ac5a1aad9 nova_proxy_admin_pass = 3de4922d8b6ac5a1aad9
nova_proxy_admin_tenant_id = 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 os_region_name = RegionOne
nova_compute_service_type = compute nova_compute_service_type = compute
@ -182,7 +182,7 @@ service_port = 5000
auth_host = 127.0.0.1 auth_host = 127.0.0.1
auth_port = 35357 auth_port = 35357
auth_protocol = http auth_protocol = http
auth_uri = http://127.0.0.1:5000/ auth_uri = http://127.0.0.1/identity/
[filter:authorization] [filter:authorization]
paste.filter_factory = trove.common.auth:AuthorizationMiddleware.factory paste.filter_factory = trove.common.auth:AuthorizationMiddleware.factory

8
install-guide/source/common_configure.txt
View File

@ -8,7 +8,7 @@
[DEFAULT] [DEFAULT]
log_dir = /var/log/trove log_dir = /var/log/trove
trove_auth_url = http://controller:5000/v2.0 trove_auth_url = http://controller/identity/v2.0
nova_compute_url = http://controller:8774/v2 nova_compute_url = http://controller:8774/v2
cinder_url = http://controller:8776/v1 cinder_url = http://controller:8776/v1
swift_url = http://controller:8080/v1/AUTH_ swift_url = http://controller:8080/v1/AUTH_
@ -53,8 +53,8 @@
... ...
[keystone_authtoken] [keystone_authtoken]
... ...
auth_uri = http://controller:5000 auth_uri = http://controller/identity
auth_url = http://controller:35357 auth_url = http://controller/identity_admin
auth_type = password auth_type = password
project_domain_name = default project_domain_name = default
user_domain_name = default user_domain_name = default
@ -100,7 +100,7 @@
nova_proxy_admin_user = admin nova_proxy_admin_user = admin
nova_proxy_admin_pass = ADMIN_PASS nova_proxy_admin_pass = ADMIN_PASS
nova_proxy_admin_tenant_name = service nova_proxy_admin_tenant_name = service
trove_auth_url = http://controller:35357/v2.0 trove_auth_url = http://controller/identity_admin/v2.0
7. Populate the trove database you created earlier in this procedure: 7. Populate the trove database you created earlier in this procedure:

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%:35357/v2.0/tokens", "trove_auth_url":"http://%service_host%/identity_admin/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%:35357/v2.0", "auth_url":"http://%service_host%/identity_admin/v2.0",
"nova_service_type":"compute", "nova_service_type":"compute",
"volume_service_type":"volume" "volume_service_type":"volume"
}, },

2
integration/scripts/trovestack
View File

@ -1061,7 +1061,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:35357/v2.0/tokens\", \"auth_url\":\"http://$KEYSTONE_AUTH_HOST/identity_admin/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\",

2
integration/tests/examples/examples/local.conf
View File

@ -1,6 +1,6 @@
{ {
"directory": "/src/apidocs/src/resources/samples/", "directory": "/src/apidocs/src/resources/samples/",
"auth_url":"http://localhost:35357/v2.0/tokens", "auth_url":"http://localhost/identity_admin/v2.0/tokens",
"api_url":"http://localhost:8779", "api_url":"http://localhost: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",

2
trove/common/cfg.py
View File

@ -97,7 +97,7 @@ common_opts = [
help='Service type to use when searching catalog.'), help='Service type to use when searching catalog.'),
cfg.StrOpt('glance_endpoint_type', default='publicURL', cfg.StrOpt('glance_endpoint_type', default='publicURL',
help='Service endpoint type to use when searching catalog.'), help='Service endpoint type to use when searching catalog.'),
cfg.URIOpt('trove_auth_url', default='http://0.0.0.0:5000/v2.0', cfg.URIOpt('trove_auth_url', default='http://0.0.0.0/identity/v2.0',
help='Trove authentication URL.'), help='Trove authentication URL.'),
cfg.StrOpt('trove_url', help='URL without the tenant segment.'), cfg.StrOpt('trove_url', help='URL without the tenant segment.'),
cfg.StrOpt('trove_service_type', default='database', cfg.StrOpt('trove_service_type', default='database',

4
trove/tests/config.py
View File

@ -66,8 +66,8 @@ class TestConfig(object):
self._values = { self._values = {
'clean_slate': os.environ.get("CLEAN_SLATE", "False") == "True", 'clean_slate': os.environ.get("CLEAN_SLATE", "False") == "True",
'fake_mode': os.environ.get("FAKE_MODE", "False") == "True", 'fake_mode': os.environ.get("FAKE_MODE", "False") == "True",
'nova_auth_url': "http://localhost:5000/v2.0", 'nova_auth_url': "http://localhost/identity/v2.0",
'trove_auth_url': "http://localhost:5000/v2.0/tokens", 'trove_auth_url': "http://localhost/identity/v2.0/tokens",
'dbaas_url': "http://localhost:8775/v1.0/dbaas", 'dbaas_url': "http://localhost:8775/v1.0/dbaas",
'version_url': "http://localhost:8775/", 'version_url': "http://localhost:8775/",
'nova_url': "http://localhost:8774/v2", 'nova_url': "http://localhost:8774/v2",