Commit 586ddb87 authored by David Johnson's avatar David Johnson

Do the keystone admin port 35357 -> 5000 migration.

parent 8c875ca5
......@@ -51,7 +51,7 @@ crudini --set /etc/nova/nova.conf neutron \
auth_strategy keystone
if [ $OSVERSION -le $OSKILO ]; then
crudini --set /etc/nova/nova.conf neutron \
admin_auth_url http://$CONTROLLER:35357/v2.0
admin_auth_url http://$CONTROLLER:${KADMINPORT}/v2.0
crudini --set /etc/nova/nova.conf neutron \
admin_tenant_name service
crudini --set /etc/nova/nova.conf neutron \
......@@ -60,7 +60,7 @@ if [ $OSVERSION -le $OSKILO ]; then
admin_password ${NEUTRON_PASS}
else
crudini --set /etc/nova/nova.conf neutron \
auth_url http://$CONTROLLER:35357
auth_url http://$CONTROLLER:${KADMINPORT}
crudini --set /etc/nova/nova.conf neutron ${AUTH_TYPE_PARAM} password
crudini --set /etc/nova/nova.conf neutron ${PROJECT_DOMAIN_PARAM} default
crudini --set /etc/nova/nova.conf neutron ${USER_DOMAIN_PARAM} default
......
......@@ -73,7 +73,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000/${KAPISTR}
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
identity_uri http://${CONTROLLER}:35357
identity_uri http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
admin_tenant_name service
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
......@@ -84,7 +84,7 @@ else
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
auth_url http://${CONTROLLER}:35357
auth_url http://${CONTROLLER}:${KADMINPORT}
if [ $OSVERSION -ge $OSMITAKA -o $KEYSTONEUSEMEMCACHE -eq 1 ]; then
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
memcached_servers ${CONTROLLER}:11211
......
......@@ -128,7 +128,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/nova/nova.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000/v2.0
crudini --set /etc/nova/nova.conf keystone_authtoken \
identity_uri http://${CONTROLLER}:35357
identity_uri http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/nova/nova.conf keystone_authtoken \
admin_tenant_name service
crudini --set /etc/nova/nova.conf keystone_authtoken \
......@@ -139,7 +139,7 @@ else
crudini --set /etc/nova/nova.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/nova/nova.conf keystone_authtoken \
auth_url http://${CONTROLLER}:35357
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/nova/nova.conf keystone_authtoken \
${AUTH_TYPE_PARAM} password
crudini --set /etc/nova/nova.conf keystone_authtoken \
......@@ -168,7 +168,7 @@ if [ $OSVERSION -ge $OSOCATA ]; then
crudini --set /etc/nova/nova.conf placement \
os_region_name $REGION
crudini --set /etc/nova/nova.conf placement \
auth_url http://${CONTROLLER}:35357/v3
auth_url http://${CONTROLLER}:${KADMINPORT}/v3
crudini --set /etc/nova/nova.conf placement \
${AUTH_TYPE_PARAM} password
crudini --set /etc/nova/nova.conf placement \
......
This diff is collapsed.
......@@ -386,6 +386,17 @@ else
REGION="RegionOne"
fi
#
# See which keystone port has the admin capabilities. This changed in
# Queens to fully drop 35357 because it's now irrelevant and not
# configured by default.
#
if [ $OSRELEASE -ge $OSQUEENS ]; then
KADMINPORT=5000
else
KADMINPORT=35357
fi
#
# Figure out if we got told to use keystone v2 or v3, or what our
# default should be if not.
......
......@@ -81,7 +81,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000/${KAPISTR}
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
identity_uri http://${CONTROLLER}:35357
identity_uri http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
admin_tenant_name service
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
......@@ -92,7 +92,7 @@ else
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_url http://${CONTROLLER}:35357
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
${AUTH_TYPE_PARAM} password
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
......@@ -121,7 +121,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/neutron/neutron.conf nova \
auth_uri http://${CONTROLLER}:5000/${KAPISTR}
crudini --set /etc/neutron/neutron.conf nova \
identity_uri http://${CONTROLLER}:35357
identity_uri http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/neutron/neutron.conf nova \
admin_tenant_name service
crudini --set /etc/neutron/neutron.conf nova \
......@@ -132,7 +132,7 @@ else
crudini --set /etc/neutron/neutron.conf nova \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/neutron/neutron.conf nova \
auth_url http://${CONTROLLER}:35357
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/neutron/neutron.conf nova \
${AUTH_TYPE_PARAM} password
crudini --set /etc/neutron/neutron.conf nova \
......@@ -154,7 +154,7 @@ if [ $OSVERSION -ge $OSOCATA ]; then
crudini --set /etc/neutron/neutron.conf placement \
os_region_name $REGION
crudini --set /etc/neutron/neutron.conf placement \
auth_url http://${CONTROLLER}:35357/v3
auth_url http://${CONTROLLER}:${KADMINPORT}/v3
crudini --set /etc/neutron/neutron.conf placement \
${AUTH_TYPE_PARAM} password
crudini --set /etc/neutron/neutron.conf placement \
......
......@@ -81,7 +81,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000/${KAPISTR}
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
identity_uri http://${CONTROLLER}:35357
identity_uri http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
admin_tenant_name service
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
......@@ -92,7 +92,7 @@ else
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
auth_url http://${CONTROLLER}:35357
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
${AUTH_TYPE_PARAM} password
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
......@@ -114,7 +114,7 @@ if [ $OSVERSION -ge $OSOCATA ]; then
crudini --set /etc/neutron/neutron.conf placement \
os_region_name $REGION
crudini --set /etc/neutron/neutron.conf placement \
auth_url http://${CONTROLLER}:35357/v3
auth_url http://${CONTROLLER}:${KADMINPORT}/v3
crudini --set /etc/neutron/neutron.conf placement \
${AUTH_TYPE_PARAM} password
crudini --set /etc/neutron/neutron.conf placement \
......
......@@ -119,7 +119,7 @@ else
crudini --set /etc/neutron/metadata_agent.ini DEFAULT \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/neutron/metadata_agent.ini DEFAULT \
auth_url http://${CONTROLLER}:35357/v2.0
auth_url http://${CONTROLLER}:${KADMINPORT}/v2.0
crudini --set /etc/neutron/metadata_agent.ini DEFAULT \
auth_region $REGION
crudini --set /etc/neutron/metadata_agent.ini DEFAULT \
......
......@@ -73,7 +73,7 @@ crudini --set /etc/manila/manila.conf keystone_authtoken \
crudini --set /etc/manila/manila.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/manila/manila.conf keystone_authtoken \
auth_url http://${CONTROLLER}:35357
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/manila/manila.conf keystone_authtoken \
${AUTH_TYPE_PARAM} password
crudini --set /etc/manila/manila.conf keystone_authtoken \
......@@ -214,7 +214,7 @@ else
crudini --set /etc/manila/manila.conf nova \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/manila/manila.conf nova \
auth_url http://${CONTROLLER}:35357
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/manila/manila.conf nova \
auth_type password
crudini --set /etc/manila/manila.conf nova \
......@@ -235,7 +235,7 @@ else
crudini --set /etc/manila/manila.conf cinder \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/manila/manila.conf cinder \
auth_url http://${CONTROLLER}:35357
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/manila/manila.conf cinder \
auth_type password
crudini --set /etc/manila/manila.conf cinder \
......@@ -258,7 +258,7 @@ else
crudini --set /etc/manila/manila.conf neutron \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/manila/manila.conf neutron \
auth_url http://${CONTROLLER}:35357
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/manila/manila.conf neutron \
auth_type password
crudini --set /etc/manila/manila.conf neutron \
......
......@@ -130,7 +130,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000/${KAPISTR}
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
identity_uri http://${CONTROLLER}:35357
identity_uri http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
admin_tenant_name service
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
......@@ -141,7 +141,7 @@ else
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
auth_uri http://${CONTROLLER}:5000
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
auth_url http://${CONTROLLER}:35357
auth_url http://${CONTROLLER}:${KADMINPORT}
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
${AUTH_TYPE_PARAM} password
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