From 65dabd378adef2d1b49daa0c15944dfc2094ffbc Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Tue, 22 Apr 2014 18:37:45 +0400 Subject: [PATCH] Fix Sahara auth configs * auth_ host/port/protocol should use corresponding $KEYSTONE_AUTH_ * add missed auth_ host/port/protocol to [keystone_authtoken] Change-Id: I0fc6434d552cdd03eb8d886681e57bb374e5bb61 --- lib/sahara | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/sahara b/lib/sahara index cb867105ba..64e82eb10d 100644 --- a/lib/sahara +++ b/lib/sahara @@ -109,15 +109,18 @@ function configure_sahara { rm -rf $SAHARA_AUTH_CACHE_DIR/* # Set obsolete keystone auth configs for backward compatibility - iniset $SAHARA_CONF_FILE DEFAULT os_auth_host $KEYSTONE_SERVICE_HOST - iniset $SAHARA_CONF_FILE DEFAULT os_auth_port $KEYSTONE_SERVICE_PORT - iniset $SAHARA_CONF_FILE DEFAULT os_auth_protocol $KEYSTONE_SERVICE_PROTOCOL + iniset $SAHARA_CONF_FILE DEFAULT os_auth_host $KEYSTONE_AUTH_HOST + iniset $SAHARA_CONF_FILE DEFAULT os_auth_port $KEYSTONE_AUTH_PORT + iniset $SAHARA_CONF_FILE DEFAULT os_auth_protocol $KEYSTONE_AUTH_PROTOCOL iniset $SAHARA_CONF_FILE DEFAULT os_admin_password $SERVICE_PASSWORD iniset $SAHARA_CONF_FILE DEFAULT os_admin_username sahara iniset $SAHARA_CONF_FILE DEFAULT os_admin_tenant_name $SERVICE_TENANT_NAME # Set actual keystone auth configs iniset $SAHARA_CONF_FILE keystone_authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/ + iniset $SAHARA_CONF_FILE keystone_authtoken auth_host $KEYSTONE_AUTH_HOST + iniset $SAHARA_CONF_FILE keystone_authtoken auth_port $KEYSTONE_AUTH_PORT + iniset $SAHARA_CONF_FILE keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL iniset $SAHARA_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME iniset $SAHARA_CONF_FILE keystone_authtoken admin_user sahara iniset $SAHARA_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD