Change-Id: Iad2a3654d8ba181a7ad452d8aba872a8313d4ece
Sean Dague authored on 2017/04/20 19:54:51... | ... |
@@ -207,7 +207,7 @@ function configure_glance { |
207 | 207 |
iniset $GLANCE_CACHE_CONF DEFAULT use_syslog $SYSLOG |
208 | 208 |
iniset $GLANCE_CACHE_CONF DEFAULT image_cache_dir $GLANCE_CACHE_DIR/ |
209 | 209 |
iniuncomment $GLANCE_CACHE_CONF DEFAULT auth_url |
210 |
- iniset $GLANCE_CACHE_CONF DEFAULT auth_url $KEYSTONE_AUTH_URI/v3 |
|
210 |
+ iniset $GLANCE_CACHE_CONF DEFAULT auth_url $KEYSTONE_AUTH_URI |
|
211 | 211 |
iniuncomment $GLANCE_CACHE_CONF DEFAULT auth_tenant_name |
212 | 212 |
iniset $GLANCE_CACHE_CONF DEFAULT admin_tenant_name $SERVICE_PROJECT_NAME |
213 | 213 |
iniuncomment $GLANCE_CACHE_CONF DEFAULT auth_user |
... | ... |
@@ -226,7 +226,7 @@ function configure_neutron_new { |
226 | 226 |
iniset $NEUTRON_META_CONF agent root_helper_daemon "$NEUTRON_ROOTWRAP_DAEMON_CMD" |
227 | 227 |
|
228 | 228 |
# TODO(dtroyer): remove the v2.0 hard code below |
229 |
- iniset $NEUTRON_META_CONF DEFAULT auth_url $KEYSTONE_SERVICE_URI/v2.0 |
|
229 |
+ iniset $NEUTRON_META_CONF DEFAULT auth_url $KEYSTONE_SERVICE_URI |
|
230 | 230 |
configure_auth_token_middleware $NEUTRON_META_CONF neutron $NEUTRON_AUTH_CACHE_DIR DEFAULT |
231 | 231 |
fi |
232 | 232 |
|
... | ... |
@@ -284,7 +284,7 @@ function configure_neutron_rootwrap { |
284 | 284 |
function configure_neutron_nova_new { |
285 | 285 |
iniset $NOVA_CONF DEFAULT use_neutron True |
286 | 286 |
iniset $NOVA_CONF neutron auth_type "password" |
287 |
- iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_URI/v3" |
|
287 |
+ iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_URI" |
|
288 | 288 |
iniset $NOVA_CONF neutron username neutron |
289 | 289 |
iniset $NOVA_CONF neutron password "$SERVICE_PASSWORD" |
290 | 290 |
iniset $NOVA_CONF neutron user_domain_name "Default" |
... | ... |
@@ -368,7 +368,7 @@ function configure_mutnauq { |
368 | 368 |
function create_nova_conf_neutron { |
369 | 369 |
iniset $NOVA_CONF DEFAULT use_neutron True |
370 | 370 |
iniset $NOVA_CONF neutron auth_type "password" |
371 |
- iniset $NOVA_CONF neutron auth_url "$KEYSTONE_AUTH_URI/v3" |
|
371 |
+ iniset $NOVA_CONF neutron auth_url "$KEYSTONE_AUTH_URI" |
|
372 | 372 |
iniset $NOVA_CONF neutron username "$Q_ADMIN_USERNAME" |
373 | 373 |
iniset $NOVA_CONF neutron password "$SERVICE_PASSWORD" |
374 | 374 |
iniset $NOVA_CONF neutron user_domain_name "$SERVICE_DOMAIN_NAME" |
... | ... |
@@ -49,7 +49,7 @@ function configure_nova_hypervisor { |
49 | 49 |
iniset $NOVA_CONF ironic auth_type password |
50 | 50 |
iniset $NOVA_CONF ironic username admin |
51 | 51 |
iniset $NOVA_CONF ironic password $ADMIN_PASSWORD |
52 |
- iniset $NOVA_CONF ironic auth_url $KEYSTONE_AUTH_URI/v3 |
|
52 |
+ iniset $NOVA_CONF ironic auth_url $KEYSTONE_AUTH_URI |
|
53 | 53 |
iniset $NOVA_CONF ironic project_domain_id default |
54 | 54 |
iniset $NOVA_CONF ironic user_domain_id default |
55 | 55 |
iniset $NOVA_CONF ironic project_name demo |
... | ... |
@@ -102,7 +102,7 @@ function _config_placement_apache_wsgi { |
102 | 102 |
|
103 | 103 |
function configure_placement_nova_compute { |
104 | 104 |
iniset $NOVA_CONF placement auth_type "password" |
105 |
- iniset $NOVA_CONF placement auth_url "$KEYSTONE_SERVICE_URI/v3" |
|
105 |
+ iniset $NOVA_CONF placement auth_url "$KEYSTONE_SERVICE_URI" |
|
106 | 106 |
iniset $NOVA_CONF placement username placement |
107 | 107 |
iniset $NOVA_CONF placement password "$SERVICE_PASSWORD" |
108 | 108 |
iniset $NOVA_CONF placement user_domain_name "$SERVICE_DOMAIN_NAME" |