openstack/devstack
Code Issues Proposed changes

Merge "Set Nova auth_proto regardless of tls-proxy."

Browse Source
This commit is contained in:
Jenkins 2013-11-05 09:36:08 +00:00 committed by Gerrit Code Review
commit e8aa8306b1
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nova
View File

@ -226,9 +226,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
@ -402,9 +400,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