Skip to content

Commit 3561d7f

Browse files
author
Jamie Lennox
committed
Use identity_uri instead of auth fragments
auth_token middleware now accepts a standard URL string as the parameter identity_uri instead of specifying protocol etc individually. Change the services over to use this. Also changes over some other places in which the auth fragments are used individually to the new variables and fixes up some misconfigurations of auth_token. identity_uri option was release in keystoneclient 0.8.0 Change-Id: Iac13bc3d08c524a6a0f39cdfbc1009e2f5c45c2a
1 parent 7006105 commit 3561d7f

11 files changed

Lines changed: 26 additions & 46 deletions

File tree

‎lib/ceilometer‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,7 @@ function configure_ceilometer {
164164
iniset $CEILOMETER_CONF service_credentials os_password $SERVICE_PASSWORD
165165
iniset $CEILOMETER_CONF service_credentials os_tenant_name $SERVICE_TENANT_NAME
166166

167-
iniset $CEILOMETER_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
168-
iniset $CEILOMETER_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT
169-
iniset $CEILOMETER_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
167+
iniset $CEILOMETER_CONF keystone_authtoken identity_uri $KEYSTONE_AUTH_URI
170168
iniset $CEILOMETER_CONF keystone_authtoken admin_user ceilometer
171169
iniset $CEILOMETER_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
172170
iniset $CEILOMETER_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME

‎lib/cinder‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,7 @@ function configure_cinder {
233233
inicomment $CINDER_API_PASTE_INI filter:authtoken admin_password
234234
inicomment $CINDER_API_PASTE_INI filter:authtoken signing_dir
235235

236-
iniset $CINDER_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
237-
iniset $CINDER_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT
238-
iniset $CINDER_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
236+
iniset $CINDER_CONF keystone_authtoken identity_uri $KEYSTONE_AUTH_URI
239237
iniset $CINDER_CONF keystone_authtoken cafile $KEYSTONE_SSL_CA
240238
iniset $CINDER_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
241239
iniset $CINDER_CONF keystone_authtoken admin_user cinder

‎lib/glance‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@ function configure_glance {
8989
iniset $GLANCE_REGISTRY_CONF DEFAULT sql_connection $dburl
9090
iniset $GLANCE_REGISTRY_CONF DEFAULT use_syslog $SYSLOG
9191
iniset $GLANCE_REGISTRY_CONF paste_deploy flavor keystone
92-
iniset $GLANCE_REGISTRY_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
93-
iniset $GLANCE_REGISTRY_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT
94-
iniset $GLANCE_REGISTRY_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
92+
iniset $GLANCE_REGISTRY_CONF keystone_authtoken identity_uri $KEYSTONE_AUTH_URI
9593
iniset $GLANCE_REGISTRY_CONF keystone_authtoken cafile $KEYSTONE_SSL_CA
9694
configure_API_version $GLANCE_REGISTRY_CONF $IDENTITY_API_VERSION
9795
iniset $GLANCE_REGISTRY_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
@@ -107,9 +105,7 @@ function configure_glance {
107105
iniset $GLANCE_API_CONF DEFAULT filesystem_store_datadir $GLANCE_IMAGE_DIR/
108106
iniset $GLANCE_API_CONF DEFAULT image_cache_dir $GLANCE_CACHE_DIR/
109107
iniset $GLANCE_API_CONF paste_deploy flavor keystone+cachemanagement
110-
iniset $GLANCE_API_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
111-
iniset $GLANCE_API_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT
112-
iniset $GLANCE_API_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
108+
iniset $GLANCE_API_CONF keystone_authtoken identity_uri $KEYSTONE_AUTH_URI
113109
iniset $GLANCE_API_CONF keystone_authtoken cafile $KEYSTONE_SSL_CA
114110
configure_API_version $GLANCE_API_CONF $IDENTITY_API_VERSION
115111
iniset $GLANCE_API_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
@@ -128,7 +124,7 @@ function configure_glance {
128124
# Store the images in swift if enabled.
129125
if is_service_enabled s-proxy; then
130126
iniset $GLANCE_API_CONF DEFAULT default_store swift
131-
iniset $GLANCE_API_CONF DEFAULT swift_store_auth_address $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/
127+
iniset $GLANCE_API_CONF DEFAULT swift_store_auth_address $KEYSTONE_SERVICE_URI/v2.0/
132128
iniset $GLANCE_API_CONF DEFAULT swift_store_user $SERVICE_TENANT_NAME:glance-swift
133129
iniset $GLANCE_API_CONF DEFAULT swift_store_key $SERVICE_PASSWORD
134130
iniset $GLANCE_API_CONF DEFAULT swift_store_create_container_on_put True
@@ -147,7 +143,7 @@ function configure_glance {
147143
iniset $GLANCE_CACHE_CONF DEFAULT filesystem_store_datadir $GLANCE_IMAGE_DIR/
148144
iniset $GLANCE_CACHE_CONF DEFAULT image_cache_dir $GLANCE_CACHE_DIR/
149145
iniuncomment $GLANCE_CACHE_CONF DEFAULT auth_url
150-
iniset $GLANCE_CACHE_CONF DEFAULT auth_url $KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT/v2.0
146+
iniset $GLANCE_CACHE_CONF DEFAULT auth_url $KEYSTONE_AUTH_URI/v2.0
151147
iniuncomment $GLANCE_CACHE_CONF DEFAULT auth_tenant_name
152148
iniset $GLANCE_CACHE_CONF DEFAULT admin_tenant_name $SERVICE_TENANT_NAME
153149
iniuncomment $GLANCE_CACHE_CONF DEFAULT auth_user

‎lib/heat‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,7 @@ function configure_heat {
107107
fi
108108

109109
# keystone authtoken
110-
iniset $HEAT_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
111-
iniset $HEAT_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT
112-
iniset $HEAT_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
110+
iniset $HEAT_CONF keystone_authtoken identity_uri $KEYSTONE_AUTH_URI
113111
configure_API_version $HEAT_CONF $IDENTITY_API_VERSION
114112
iniset $HEAT_CONF keystone_authtoken cafile $KEYSTONE_SSL_CA
115113
iniset $HEAT_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
@@ -118,7 +116,7 @@ function configure_heat {
118116
iniset $HEAT_CONF keystone_authtoken signing_dir $HEAT_AUTH_CACHE_DIR
119117

120118
# ec2authtoken
121-
iniset $HEAT_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0
119+
iniset $HEAT_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_URI/v2.0
122120

123121
# paste_deploy
124122
[[ "$HEAT_STANDALONE" = "True" ]] && iniset $HEAT_CONF paste_deploy flavor standalone
@@ -269,7 +267,7 @@ function create_heat_accounts {
269267
if [[ "$HEAT_STACK_DOMAIN" == "True" ]]; then
270268
# Note we have to pass token/endpoint here because the current endpoint and
271269
# version negotiation in OSC means just --os-identity-api-version=3 won't work
272-
KS_ENDPOINT_V3="$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v3"
270+
KS_ENDPOINT_V3="$KEYSTONE_SERVICE_URI/v3"
273271
D_ID=$(openstack --os-token $OS_TOKEN --os-url=$KS_ENDPOINT_V3 \
274272
--os-identity-api-version=3 domain create heat \
275273
--description "Owns users and projects created by heat" \

‎lib/ironic‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,9 @@ function configure_ironic {
162162
function configure_ironic_api {
163163
iniset $IRONIC_CONF_FILE DEFAULT auth_strategy keystone
164164
iniset $IRONIC_CONF_FILE DEFAULT policy_file $IRONIC_POLICY_JSON
165-
iniset $IRONIC_CONF_FILE keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
166-
iniset $IRONIC_CONF_FILE keystone_authtoken auth_port $KEYSTONE_AUTH_PORT
167-
iniset $IRONIC_CONF_FILE keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
165+
iniset $IRONIC_CONF_FILE keystone_authtoken identity_uri $KEYSTONE_AUTH_URI
168166
iniset $IRONIC_CONF_FILE keystone_authtoken cafile $KEYSTONE_SSL_CA
169-
iniset $IRONIC_CONF_FILE keystone_authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/
167+
iniset $IRONIC_CONF_FILE keystone_authtoken auth_uri $KEYSTONE_SERVICE_URI
170168
iniset $IRONIC_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
171169
iniset $IRONIC_CONF_FILE keystone_authtoken admin_user ironic
172170
iniset $IRONIC_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD

‎lib/keystone‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ if is_ssl_enabled_service "key"; then
8787
KEYSTONE_SERVICE_PROTOCOL="https"
8888
fi
8989

90+
# complete URIs
91+
KEYSTONE_AUTH_URI=${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}:${KEYSTONE_AUTH_PORT}
92+
KEYSTONE_SERVICE_URI=${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${KEYSTONE_SERVICE_PORT}
93+
9094
# Functions
9195
# ---------
9296
# cleanup_keystone() - Remove residual data files, anything left over from previous

‎lib/neutron‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ function _configure_neutron_metadata_agent {
726726
iniset $Q_META_CONF_FILE DEFAULT nova_metadata_ip $Q_META_DATA_IP
727727
iniset $Q_META_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"
728728

729-
_neutron_setup_keystone $Q_META_CONF_FILE DEFAULT True True True
729+
_neutron_setup_keystone $Q_META_CONF_FILE DEFAULT True True
730730

731731
}
732732

@@ -868,18 +868,9 @@ function _neutron_setup_keystone {
868868
local section=$2
869869
local use_auth_url=$3
870870
local skip_auth_cache=$4
871-
local use_service_port=$5
872-
local keystone_port=$KEYSTONE_AUTH_PORT
873-
if [[ -n $use_service_port ]]; then
874-
keystone_port=$KEYSTONE_SERVICE_PORT
875-
fi
876-
if [[ -n $use_auth_url ]]; then
877-
iniset $conf_file $section auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_AUTH_HOST:$keystone_port/v2.0"
878-
else
879-
iniset $conf_file $section auth_host $KEYSTONE_SERVICE_HOST
880-
iniset $conf_file $section auth_port $keystone_port
881-
iniset $conf_file $section auth_protocol $KEYSTONE_SERVICE_PROTOCOL
882-
fi
871+
872+
iniset $conf_file $section auth_uri $KEYSTONE_SERVICE_URI
873+
iniset $conf_file $section identity_uri $KEYSTONE_AUTH_URI
883874
iniset $conf_file $section admin_tenant_name $SERVICE_TENANT_NAME
884875
iniset $conf_file $section admin_user $Q_ADMIN_USERNAME
885876
iniset $conf_file $section admin_password $SERVICE_PASSWORD

‎lib/nova‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -456,9 +456,7 @@ function create_nova_conf {
456456

457457
# Add keystone authtoken configuration
458458

459-
iniset $NOVA_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
460-
iniset $NOVA_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT
461-
iniset $NOVA_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
459+
iniset $NOVA_CONF keystone_authtoken identity_uri $KEYSTONE_AUTH_URI
462460
iniset $NOVA_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
463461
iniset $NOVA_CONF keystone_authtoken cafile $KEYSTONE_SSL_CA
464462
iniset $NOVA_CONF keystone_authtoken admin_user nova

‎lib/nova_plugins/hypervisor-ironic‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function configure_nova_hypervisor {
4848
# ironic section
4949
iniset $NOVA_CONF ironic admin_username admin
5050
iniset $NOVA_CONF ironic admin_password $ADMIN_PASSWORD
51-
iniset $NOVA_CONF ironic admin_url $KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT/v2.0
51+
iniset $NOVA_CONF ironic admin_url $KEYSTONE_AUTH_URI/v2.0
5252
iniset $NOVA_CONF ironic admin_tenant_name demo
5353
iniset $NOVA_CONF ironic api_endpoint http://$SERVICE_HOST:6385/v1
5454
iniset $NOVA_CONF ironic sql_connection `database_connection_url nova_bm`

‎lib/trove‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,8 @@ function configure_trove {
133133
# Copy api-paste file over to the trove conf dir and configure it
134134
cp $TROVE_LOCAL_CONF_DIR/api-paste.ini $TROVE_CONF_DIR/api-paste.ini
135135
TROVE_API_PASTE_INI=$TROVE_CONF_DIR/api-paste.ini
136-
iniset $TROVE_API_PASTE_INI filter:authtoken auth_host $KEYSTONE_AUTH_HOST
137-
iniset $TROVE_API_PASTE_INI filter:authtoken auth_port $KEYSTONE_AUTH_PORT
138-
iniset $TROVE_API_PASTE_INI filter:authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
136+
137+
iniset $TROVE_API_PASTE_INI filter:authtoken identity_uri $KEYSTONE_AUTH_URI
139138
iniset $TROVE_API_PASTE_INI filter:authtoken cafile $KEYSTONE_SSL_CA
140139
iniset $TROVE_API_PASTE_INI filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME
141140
iniset $TROVE_API_PASTE_INI filter:authtoken admin_user trove
@@ -158,7 +157,7 @@ function configure_trove {
158157

159158
# (Re)create trove taskmanager conf file if needed
160159
if is_service_enabled tr-tmgr; then
161-
TROVE_AUTH_ENDPOINT=$KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT//v$IDENTITY_API_VERSION
160+
TROVE_AUTH_ENDPOINT=$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION
162161

163162
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT rabbit_password $RABBIT_PASSWORD
164163
iniset $TROVE_CONF_DIR/trove-taskmanager.conf DEFAULT sql_connection `database_connection_url trove`

0 commit comments

Comments
 (0)