openstack/kolla-ansible
Code Issues Proposed changes

fix nova auth configuration

Browse Source 
Based on
http://lists.openstack.org/pipermail/openstack/2014-January/004667.html,
there is confusion in the openstack community on how auth_uri in
nova.conf is supposed to interact with the other auth_* settings.

I've modified our config to use both for now.

Change-Id: I1433305e23d872cd773599c85053ba8f9aeb6145
This commit is contained in:
Lars Kellogg-Stedman 2014-10-17 10:15:59 -04:00
parent d6632b90a2
commit 1f3d58a97d
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docker/nova-controller/nova-ctr-base/config-nova-controller.sh
View File

@ -67,13 +67,18 @@ crudini --set $cfg DEFAULT admin_token "${KEYSTONE_ADMIN_TOKEN}"
crudini --set $cfg conductor workers 8
for option in auth_protocol auth_host auth_port; do
crudini --del $cfg \
keystone_authtoken \
$option
done
# disabled pending answers to http://lists.openstack.org/pipermail/openstack/2014-October/009997.html
#for option in auth_protocol auth_host auth_port; do
# crudini --del $cfg \
# keystone_authtoken \
# $option
#done
crudini --set $cfg keystone_authtoken auth_uri "http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/"
crudini --set $cfg keystone_authtoken auth_protocol http
crudini --set $cfg keystone_authtoken auth_host ${KEYSTONE_PUBLIC_SERVICE_HOST}
crudini --set $cfg keystone_authtoken auth_port 5000
crudini --set $cfg keystone_authtoken admin_user ${NOVA_KEYSTONE_USER}
crudini --set $cfg keystone_authtoken admin_password "${NOVA_KEYSTONE_PASSWORD}"
crudini --set $cfg keystone_authtoken admin_tenant_name ${ADMIN_TENANT_NAME}