Skip to content

Commit 586ddb8

Browse files
carboxylmancarboxylman
committed
Do the keystone admin port 35357 -> 5000 migration.
1 parent 8c875ca commit 586ddb8

10 files changed

+76
-65
lines changed

‎setup-compute-network.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ crudini --set /etc/nova/nova.conf neutron \
5151
auth_strategy keystone
5252
if [ $OSVERSION -le $OSKILO ]; then
5353
crudini --set /etc/nova/nova.conf neutron \
54-
admin_auth_url http://$CONTROLLER:35357/v2.0
54+
admin_auth_url http://$CONTROLLER:${KADMINPORT}/v2.0
5555
crudini --set /etc/nova/nova.conf neutron \
5656
admin_tenant_name service
5757
crudini --set /etc/nova/nova.conf neutron \
@@ -60,7 +60,7 @@ if [ $OSVERSION -le $OSKILO ]; then
6060
admin_password ${NEUTRON_PASS}
6161
else
6262
crudini --set /etc/nova/nova.conf neutron \
63-
auth_url http://$CONTROLLER:35357
63+
auth_url http://$CONTROLLER:${KADMINPORT}
6464
crudini --set /etc/nova/nova.conf neutron ${AUTH_TYPE_PARAM} password
6565
crudini --set /etc/nova/nova.conf neutron ${PROJECT_DOMAIN_PARAM} default
6666
crudini --set /etc/nova/nova.conf neutron ${USER_DOMAIN_PARAM} default

‎setup-compute-telemetry.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
7373
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
7474
auth_uri http://${CONTROLLER}:5000/${KAPISTR}
7575
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
76-
identity_uri http://${CONTROLLER}:35357
76+
identity_uri http://${CONTROLLER}:${KADMINPORT}
7777
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
7878
admin_tenant_name service
7979
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
@@ -84,7 +84,7 @@ else
8484
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
8585
auth_uri http://${CONTROLLER}:5000
8686
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
87-
auth_url http://${CONTROLLER}:35357
87+
auth_url http://${CONTROLLER}:${KADMINPORT}
8888
if [ $OSVERSION -ge $OSMITAKA -o $KEYSTONEUSEMEMCACHE -eq 1 ]; then
8989
crudini --set /etc/ceilometer/ceilometer.conf keystone_authtoken \
9090
memcached_servers ${CONTROLLER}:11211

‎setup-compute.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
128128
crudini --set /etc/nova/nova.conf keystone_authtoken \
129129
auth_uri http://${CONTROLLER}:5000/v2.0
130130
crudini --set /etc/nova/nova.conf keystone_authtoken \
131-
identity_uri http://${CONTROLLER}:35357
131+
identity_uri http://${CONTROLLER}:${KADMINPORT}
132132
crudini --set /etc/nova/nova.conf keystone_authtoken \
133133
admin_tenant_name service
134134
crudini --set /etc/nova/nova.conf keystone_authtoken \
@@ -139,7 +139,7 @@ else
139139
crudini --set /etc/nova/nova.conf keystone_authtoken \
140140
auth_uri http://${CONTROLLER}:5000
141141
crudini --set /etc/nova/nova.conf keystone_authtoken \
142-
auth_url http://${CONTROLLER}:35357
142+
auth_url http://${CONTROLLER}:${KADMINPORT}
143143
crudini --set /etc/nova/nova.conf keystone_authtoken \
144144
${AUTH_TYPE_PARAM} password
145145
crudini --set /etc/nova/nova.conf keystone_authtoken \
@@ -168,7 +168,7 @@ if [ $OSVERSION -ge $OSOCATA ]; then
168168
crudini --set /etc/nova/nova.conf placement \
169169
os_region_name $REGION
170170
crudini --set /etc/nova/nova.conf placement \
171-
auth_url http://${CONTROLLER}:35357/v3
171+
auth_url http://${CONTROLLER}:${KADMINPORT}/v3
172172
crudini --set /etc/nova/nova.conf placement \
173173
${AUTH_TYPE_PARAM} password
174174
crudini --set /etc/nova/nova.conf placement \

‎setup-controller.sh

+43-43
Large diffs are not rendered by default.

‎setup-lib.sh

+11
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,17 @@ else
386386
REGION="RegionOne"
387387
fi
388388

389+
#
390+
# See which keystone port has the admin capabilities. This changed in
391+
# Queens to fully drop 35357 because it's now irrelevant and not
392+
# configured by default.
393+
#
394+
if [ $OSRELEASE -ge $OSQUEENS ]; then
395+
KADMINPORT=5000
396+
else
397+
KADMINPORT=35357
398+
fi
399+
389400
#
390401
# Figure out if we got told to use keystone v2 or v3, or what our
391402
# default should be if not.

‎setup-network-plugin-linuxbridge.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
8181
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
8282
auth_uri http://${CONTROLLER}:5000/${KAPISTR}
8383
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
84-
identity_uri http://${CONTROLLER}:35357
84+
identity_uri http://${CONTROLLER}:${KADMINPORT}
8585
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
8686
admin_tenant_name service
8787
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
@@ -92,7 +92,7 @@ else
9292
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
9393
auth_uri http://${CONTROLLER}:5000
9494
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
95-
auth_url http://${CONTROLLER}:35357
95+
auth_url http://${CONTROLLER}:${KADMINPORT}
9696
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
9797
${AUTH_TYPE_PARAM} password
9898
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
@@ -121,7 +121,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
121121
crudini --set /etc/neutron/neutron.conf nova \
122122
auth_uri http://${CONTROLLER}:5000/${KAPISTR}
123123
crudini --set /etc/neutron/neutron.conf nova \
124-
identity_uri http://${CONTROLLER}:35357
124+
identity_uri http://${CONTROLLER}:${KADMINPORT}
125125
crudini --set /etc/neutron/neutron.conf nova \
126126
admin_tenant_name service
127127
crudini --set /etc/neutron/neutron.conf nova \
@@ -132,7 +132,7 @@ else
132132
crudini --set /etc/neutron/neutron.conf nova \
133133
auth_uri http://${CONTROLLER}:5000
134134
crudini --set /etc/neutron/neutron.conf nova \
135-
auth_url http://${CONTROLLER}:35357
135+
auth_url http://${CONTROLLER}:${KADMINPORT}
136136
crudini --set /etc/neutron/neutron.conf nova \
137137
${AUTH_TYPE_PARAM} password
138138
crudini --set /etc/neutron/neutron.conf nova \
@@ -154,7 +154,7 @@ if [ $OSVERSION -ge $OSOCATA ]; then
154154
crudini --set /etc/neutron/neutron.conf placement \
155155
os_region_name $REGION
156156
crudini --set /etc/neutron/neutron.conf placement \
157-
auth_url http://${CONTROLLER}:35357/v3
157+
auth_url http://${CONTROLLER}:${KADMINPORT}/v3
158158
crudini --set /etc/neutron/neutron.conf placement \
159159
${AUTH_TYPE_PARAM} password
160160
crudini --set /etc/neutron/neutron.conf placement \

‎setup-network-plugin-openvswitch.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
8181
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
8282
auth_uri http://${CONTROLLER}:5000/${KAPISTR}
8383
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
84-
identity_uri http://${CONTROLLER}:35357
84+
identity_uri http://${CONTROLLER}:${KADMINPORT}
8585
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
8686
admin_tenant_name service
8787
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
@@ -92,7 +92,7 @@ else
9292
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
9393
auth_uri http://${CONTROLLER}:5000
9494
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
95-
auth_url http://${CONTROLLER}:35357
95+
auth_url http://${CONTROLLER}:${KADMINPORT}
9696
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
9797
${AUTH_TYPE_PARAM} password
9898
crudini --set /etc/neutron/neutron.conf keystone_authtoken \
@@ -114,7 +114,7 @@ if [ $OSVERSION -ge $OSOCATA ]; then
114114
crudini --set /etc/neutron/neutron.conf placement \
115115
os_region_name $REGION
116116
crudini --set /etc/neutron/neutron.conf placement \
117-
auth_url http://${CONTROLLER}:35357/v3
117+
auth_url http://${CONTROLLER}:${KADMINPORT}/v3
118118
crudini --set /etc/neutron/neutron.conf placement \
119119
${AUTH_TYPE_PARAM} password
120120
crudini --set /etc/neutron/neutron.conf placement \

‎setup-networkmanager.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ else
119119
crudini --set /etc/neutron/metadata_agent.ini DEFAULT \
120120
auth_uri http://${CONTROLLER}:5000
121121
crudini --set /etc/neutron/metadata_agent.ini DEFAULT \
122-
auth_url http://${CONTROLLER}:35357/v2.0
122+
auth_url http://${CONTROLLER}:${KADMINPORT}/v2.0
123123
crudini --set /etc/neutron/metadata_agent.ini DEFAULT \
124124
auth_region $REGION
125125
crudini --set /etc/neutron/metadata_agent.ini DEFAULT \

‎setup-share-node.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ crudini --set /etc/manila/manila.conf keystone_authtoken \
7373
crudini --set /etc/manila/manila.conf keystone_authtoken \
7474
auth_uri http://${CONTROLLER}:5000
7575
crudini --set /etc/manila/manila.conf keystone_authtoken \
76-
auth_url http://${CONTROLLER}:35357
76+
auth_url http://${CONTROLLER}:${KADMINPORT}
7777
crudini --set /etc/manila/manila.conf keystone_authtoken \
7878
${AUTH_TYPE_PARAM} password
7979
crudini --set /etc/manila/manila.conf keystone_authtoken \
@@ -214,7 +214,7 @@ else
214214
crudini --set /etc/manila/manila.conf nova \
215215
auth_uri http://${CONTROLLER}:5000
216216
crudini --set /etc/manila/manila.conf nova \
217-
auth_url http://${CONTROLLER}:35357
217+
auth_url http://${CONTROLLER}:${KADMINPORT}
218218
crudini --set /etc/manila/manila.conf nova \
219219
auth_type password
220220
crudini --set /etc/manila/manila.conf nova \
@@ -235,7 +235,7 @@ else
235235
crudini --set /etc/manila/manila.conf cinder \
236236
auth_uri http://${CONTROLLER}:5000
237237
crudini --set /etc/manila/manila.conf cinder \
238-
auth_url http://${CONTROLLER}:35357
238+
auth_url http://${CONTROLLER}:${KADMINPORT}
239239
crudini --set /etc/manila/manila.conf cinder \
240240
auth_type password
241241
crudini --set /etc/manila/manila.conf cinder \
@@ -258,7 +258,7 @@ else
258258
crudini --set /etc/manila/manila.conf neutron \
259259
auth_uri http://${CONTROLLER}:5000
260260
crudini --set /etc/manila/manila.conf neutron \
261-
auth_url http://${CONTROLLER}:35357
261+
auth_url http://${CONTROLLER}:${KADMINPORT}
262262
crudini --set /etc/manila/manila.conf neutron \
263263
auth_type password
264264
crudini --set /etc/manila/manila.conf neutron \

‎setup-storage.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ if [ $OSVERSION -lt $OSKILO ]; then
130130
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
131131
auth_uri http://${CONTROLLER}:5000/${KAPISTR}
132132
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
133-
identity_uri http://${CONTROLLER}:35357
133+
identity_uri http://${CONTROLLER}:${KADMINPORT}
134134
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
135135
admin_tenant_name service
136136
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
@@ -141,7 +141,7 @@ else
141141
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
142142
auth_uri http://${CONTROLLER}:5000
143143
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
144-
auth_url http://${CONTROLLER}:35357
144+
auth_url http://${CONTROLLER}:${KADMINPORT}
145145
crudini --set /etc/cinder/cinder.conf keystone_authtoken \
146146
${AUTH_TYPE_PARAM} password
147147
crudini --set /etc/cinder/cinder.conf keystone_authtoken \

0 commit comments

Comments
 (0)