openstack/devstack
Code Issues Proposed changes

Set Nova auth_proto regardless of tls-proxy.

Browse Source 
We actually want to comment out the keystone auth_proto in Nova's
api-paste.ini file regardless of the tls-proxy setting. Likewise
lets always set it in nova.conf as well.

This should fix an issue in trying to get this in:

  https://review.openstack.org/#/c/52825/

Change-Id: I1b8202aa1666cbb6ca13d2f77d50fa0175969266
This commit is contained in:
Dan Prince 2013-10-30 15:11:08 -04:00
parent 1bdc7a67b3
commit b245c5d21c
1 changed files with 2 additions and 6 deletions

4
lib/nova

@ -221,9 +221,7 @@ function configure_nova() {
# Comment out the keystone configs in Nova's api-paste.ini. # Comment out the keystone configs in Nova's api-paste.ini.
# We are using nova.conf to configure this instead. # We are using nova.conf to configure this instead.
inicomment $NOVA_API_PASTE_INI filter:authtoken auth_host inicomment $NOVA_API_PASTE_INI filter:authtoken auth_host
if is_service_enabled tls-proxy; then
inicomment $NOVA_API_PASTE_INI filter:authtoken auth_protocol inicomment $NOVA_API_PASTE_INI filter:authtoken auth_protocol
fi
inicomment $NOVA_API_PASTE_INI filter:authtoken admin_tenant_name inicomment $NOVA_API_PASTE_INI filter:authtoken admin_tenant_name
inicomment $NOVA_API_PASTE_INI filter:authtoken admin_user inicomment $NOVA_API_PASTE_INI filter:authtoken admin_user
inicomment $NOVA_API_PASTE_INI filter:authtoken admin_password inicomment $NOVA_API_PASTE_INI filter:authtoken admin_password
@ -397,9 +395,7 @@ function create_nova_conf() {
# Add keystone authtoken configuration # Add keystone authtoken configuration
iniset $NOVA_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST iniset $NOVA_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
if is_service_enabled tls-proxy; then
iniset $NOVA_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL iniset $NOVA_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
fi
iniset $NOVA_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME iniset $NOVA_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
iniset $NOVA_CONF keystone_authtoken admin_user nova iniset $NOVA_CONF keystone_authtoken admin_user nova
iniset $NOVA_CONF keystone_authtoken admin_password $SERVICE_PASSWORD iniset $NOVA_CONF keystone_authtoken admin_password $SERVICE_PASSWORD