Commit f95bcb04 authored by David Johnson's avatar David Johnson

Handle the auth_uri -> www_authenticate_uri changeover.

parent 20aa6a28
......@@ -82,7 +82,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
admin_password "${CEILOMETER_PASS}"
else
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
if [ $OSVERSION -ge $OSMITAKA -o $KEYSTONEUSEMEMCACHE -eq 1 ]; then
......
......@@ -194,7 +194,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
admin_password "${NOVA_PASS}"
else
crudini --set /etc/nova/nova.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/nova/nova.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/nova/nova.conf keystone_authtoken \
......
......@@ -886,13 +886,8 @@ if [ -z "${GLANCE_DBPASS}" ]; then
crudini --set /etc/glance/glance-api.conf keystone_authtoken \
admin_password "${GLANCE_PASS}"
else
if [ $OSVERSION -le $OSROCKY ]; then
crudini --set /etc/glance/glance-api.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
else
crudini --set /etc/glance/glance-api.conf keystone_authtoken \
www_authenticate_uri http://${CONTROLLER}:5000
fi
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/glance/glance-api.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/glance/glance-api.conf keystone_authtoken \
......@@ -941,7 +936,7 @@ if [ -z "${GLANCE_DBPASS}" ]; then
admin_password "${GLANCE_PASS}"
else
crudini --set /etc/glance/glance-registry.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/glance/glance-registry.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/glance/glance-registry.conf keystone_authtoken \
......@@ -1197,13 +1192,8 @@ EOF
crudini --set /etc/nova/nova.conf keystone_authtoken \
admin_password "${NOVA_PASS}"
else
if [ $OSVERSION -ge $OSSTEIN ]; then
crudini --set /etc/nova/nova.conf keystone_authtoken \
www_authenticate_uri http://${CONTROLLER}:5000
else
crudini --set /etc/nova/nova.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
fi
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/nova/nova.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/nova/nova.conf keystone_authtoken \
......@@ -1553,7 +1543,7 @@ if [ -z "${NEUTRON_DBPASS}" ]; then
admin_password "${NEUTRON_PASS}"
else
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
......@@ -2189,7 +2179,7 @@ if [ -z "${CINDER_DBPASS}" ]; then
admin_password "${CINDER_PASS}"
else
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
......@@ -2348,7 +2338,7 @@ if [ $OSVERSION -ge $OSMITAKA -a -z "${MANILA_DBPASS}" ]; then
crudini --set /etc/manila/manila.conf keystone_authtoken \
memcached_servers ${CONTROLLER}:11211
crudini --set /etc/manila/manila.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/manila/manila.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/manila/manila.conf keystone_authtoken \
......@@ -2846,7 +2836,7 @@ if [ -z "${HEAT_DBPASS}" ]; then
admin_password "${HEAT_PASS}"
else
crudini --set /etc/heat/heat.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/heat/heat.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/heat/heat.conf keystone_authtoken \
......@@ -2885,7 +2875,7 @@ if [ -z "${HEAT_DBPASS}" ]; then
${USER_DOMAIN_PARAM} default
crudini --set /etc/heat/heat.conf clients_keystone \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
fi
crudini --set /etc/heat/heat.conf DEFAULT \
......@@ -3289,7 +3279,7 @@ EOF
crudini --set /etc/gnocchi/gnocchi.conf api auth_mode keystone
crudini --set /etc/gnocchi/gnocchi.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/gnocchi/gnocchi.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/gnocchi/gnocchi.conf keystone_authtoken \
......@@ -4036,7 +4026,7 @@ signing_dir = /var/cache/trove
EOF
else
crudini --set /etc/trove/trove.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/trove/trove.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/trove/trove.conf keystone_authtoken \
......@@ -4239,9 +4229,7 @@ if [ -z "${SAHARA_DBPASS}" ]; then
admin_password "${SAHARA_PASS}"
else
crudini --set /etc/sahara/sahara.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/sahara/sahara.conf keystone_authtoken \
www_authenticate_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/sahara/sahara.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/sahara/sahara.conf keystone_authtoken \
......@@ -4366,7 +4354,7 @@ if [ 0 = 1 -a "$OSCODENAME" = "kilo" -a -n "$BAREMETALNODES" -a -z "${IRONIC_DBP
crudini --set /etc/ironic/ironic.conf DEFAULT auth_strategy keystone
crudini --set /etc/ironic/ironic.conf \
keystone_authtoken auth_uri "http://$CONTROLLER:5000/"
keystone_authtoken ${AUTH_URI_KEY} "http://$CONTROLLER:5000/"
crudini --set /etc/ironic/ironic.conf \
keystone_authtoken identity_uri "http://$CONTROLLER:${KADMINPORT}"
crudini --set /etc/ironic/ironic.conf \
......@@ -4518,7 +4506,7 @@ EOF
crudini --del /etc/designate/designate.conf keystone_authtoken \
user_domain_id
crudini --set /etc/designate/designate.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/designate/designate.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/designate/designate.conf keystone_authtoken \
......@@ -4725,7 +4713,7 @@ if [ $OSVERSION -ge $OSROCKY -a -z "${MAGNUM_DBPASS}" ]; then
crudini --set /etc/magnum/magnum.conf keystone_authtoken \
auth_version $KAPISTR
crudini --set /etc/magnum/magnum.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000/$KAPISTR
${AUTH_URI_KEY} http://${CONTROLLER}:5000/$KAPISTR
crudini --set /etc/magnum/magnum.conf keystone_authtoken \
${PROJECT_DOMAIN_PARAM} default
crudini --set /etc/magnum/magnum.conf keystone_authtoken \
......
......@@ -396,6 +396,14 @@ else
REGION="RegionOne"
fi
#
# Stop using auth_uri in favor of www_authenticate_uri at Stein.
#
AUTH_URI_KEY="auth_uri"
if [ $OSVERSION -ge $OSSTEIN ]; then
AUTH_URI_KEY="www_authenticate_uri"
fi
#
# We started using Python 3 packages at Stein.
#
......
......@@ -99,7 +99,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
admin_password "${NEUTRON_PASS}"
else
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
......@@ -139,7 +139,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
admin_password "${NOVA_PASS}"
else
crudini --set /etc/neutron/neutron.conf nova \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/neutron/neutron.conf nova \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/neutron/neutron.conf nova \
......
......@@ -99,7 +99,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
admin_password "${NEUTRON_PASS}"
else
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
......
......@@ -127,7 +127,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
admin_password ${NEUTRON_PASS}
else
crudini --set /etc/neutron/metadata_agent.ini DEFAULT \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/neutron/metadata_agent.ini DEFAULT \
auth_url http://${CONTROLLER}:${KADMINPORT}/v2.0
crudini --set /etc/neutron/metadata_agent.ini DEFAULT \
......
......@@ -71,7 +71,7 @@ fi
crudini --set /etc/manila/manila.conf keystone_authtoken \
memcached_servers ${CONTROLLER}:11211
crudini --set /etc/manila/manila.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/manila/manila.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/manila/manila.conf keystone_authtoken \
......@@ -177,7 +177,7 @@ else
service_network_cidr 10.133.0.0/16
crudini --set /etc/manila/manila.conf nova \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/manila/manila.conf nova \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/manila/manila.conf nova \
......@@ -198,7 +198,7 @@ else
region_name $REGION
crudini --set /etc/manila/manila.conf cinder \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/manila/manila.conf cinder \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/manila/manila.conf cinder \
......@@ -221,7 +221,7 @@ else
crudini --set /etc/manila/manila.conf neutron \
url http://${CONTROLLER}:9696
crudini --set /etc/manila/manila.conf neutron \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/manila/manila.conf neutron \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/manila/manila.conf neutron \
......
......@@ -112,7 +112,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
admin_password "${CINDER_PASS}"
else
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
${AUTH_URI_KEY} http://${CONTROLLER}:5000
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment