1. devstack
  2. Commit c2c89e4b35a9ad5fb1a2670943328a9725b37001
Browse code

Use KEYSTONE_SERVICE_URI consistently

lib/keystone builds KEYSTONE_SERVICE_URI so that other services
don't need to reconstruct the identity URI. Many services already
use it, but some parts were still building the identity URI from
the different parts.

This will allow changing the identity URI to include a path
(e.g., to http://<host>/identity) in 1 place rather than in
multiple places.

Change-Id: I58cbdbe591d8869807545e0815480fc3375e0479

Brant Knudson authored on 2017/02/24 11:15:47
Showing 4 changed files
lib/neutron
History View file @ c2c89e4
... ... 
@@ -282,7 +282,7 @@ function configure_neutron_rootwrap {
282 282 
 function configure_neutron_nova_new {
283 283 
     iniset $NOVA_CONF DEFAULT use_neutron True
284 284 
     iniset $NOVA_CONF neutron auth_type "password"
285 
-    iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v3"
285 
+    iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_URI/v3"
286 286 
     iniset $NOVA_CONF neutron username neutron
287 287 
     iniset $NOVA_CONF neutron password "$SERVICE_PASSWORD"
288 288 
     iniset $NOVA_CONF neutron user_domain_name "Default"
lib/nova
History View file @ c2c89e4
... ... 
@@ -631,7 +631,7 @@ function create_nova_conf {
631 631 
 function init_nova_service_user_conf {
632 632 
     iniset $NOVA_CONF service_user send_service_user_token True
633 633 
     iniset $NOVA_CONF service_user auth_type password
634 
-    iniset $NOVA_CONF service_user auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT"
634 
+    iniset $NOVA_CONF service_user auth_url "$KEYSTONE_SERVICE_URI"
635 635 
     iniset $NOVA_CONF service_user username nova
636 636 
     iniset $NOVA_CONF service_user password "$SERVICE_PASSWORD"
637 637 
     iniset $NOVA_CONF service_user user_domain_name "$SERVICE_DOMAIN_NAME"
lib/placement
History View file @ c2c89e4
... ... 
@@ -100,7 +100,7 @@ function _config_placement_apache_wsgi {
100 100
101 101 
 function configure_placement_nova_compute {
102 102 
     iniset $NOVA_CONF placement auth_type "password"
103 
-    iniset $NOVA_CONF placement auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v3"
103 
+    iniset $NOVA_CONF placement auth_url "$KEYSTONE_SERVICE_URI/v3"
104 104 
     iniset $NOVA_CONF placement username placement
105 105 
     iniset $NOVA_CONF placement password "$SERVICE_PASSWORD"
106 106 
     iniset $NOVA_CONF placement user_domain_name "$SERVICE_DOMAIN_NAME"
lib/tempest
History View file @ c2c89e4
... ... 
@@ -17,7 +17,7 @@
17 17 
 #   - ``PUBLIC_NETWORK_NAME``
18 18 
 #   - ``VIRT_DRIVER``
19 19 
 #   - ``LIBVIRT_TYPE``
20 
-#   - ``KEYSTONE_SERVICE_PROTOCOL``, ``KEYSTONE_SERVICE_HOST`` from lib/keystone
20 
+#   - ``KEYSTONE_SERVICE_URI``, ``KEYSTONE_SERVICE_URI_V3`` from lib/keystone
21 21 
 #
22 22 
 # Optional Dependencies:
23 23 
 #
... ... 
@@ -257,7 +257,7 @@ function configure_tempest {
257 257 
     iniset $TEMPEST_CONFIG volume build_timeout $BUILD_TIMEOUT
258 258
259 259 
     # Identity
260 
-    iniset $TEMPEST_CONFIG identity uri "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:5000/v2.0/"
260 
+    iniset $TEMPEST_CONFIG identity uri "$KEYSTONE_SERVICE_URI/v2.0/"
261 261 
     iniset $TEMPEST_CONFIG identity uri_v3 "$KEYSTONE_SERVICE_URI_V3"
262 262 
     iniset $TEMPEST_CONFIG identity user_lockout_failure_attempts $KEYSTONE_LOCKOUT_FAILURE_ATTEMPTS
263 263 
     iniset $TEMPEST_CONFIG identity user_lockout_duration $KEYSTONE_LOCKOUT_DURATION