Merge "Multi-node setup: Fix keystone host"

This commit is contained in:
Jenkins 2013-03-25 16:21:13 +00:00 committed by Gerrit Code Review
commit b6a86dbe0f

View File

@ -224,9 +224,9 @@ function configure_nova() {
# Get the sample configuration file in place
cp $NOVA_DIR/etc/nova/api-paste.ini $NOVA_CONF_DIR
iniset $NOVA_API_PASTE_INI filter:authtoken auth_host $SERVICE_HOST
iniset $NOVA_API_PASTE_INI filter:authtoken auth_host $KEYSTONE_AUTH_HOST
if is_service_enabled tls-proxy; then
iniset $NOVA_API_PASTE_INI filter:authtoken auth_protocol $SERVICE_PROTOCOL
iniset $NOVA_API_PASTE_INI filter:authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
fi
iniset $NOVA_API_PASTE_INI filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME
iniset $NOVA_API_PASTE_INI filter:authtoken admin_user nova