1. devstack
  2. Commit 65dabd378adef2d1b49daa0c15944dfc2094ffbc
Browse code

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

Sergey Lukjanov authored on 2014/04/22 23:37:45
Showing 1 changed files
lib/sahara
History View file @ 65dabd3
... ... 
@@ -109,15 +109,18 @@ function configure_sahara {
109 109 
     rm -rf $SAHARA_AUTH_CACHE_DIR/*
110 110
111 111 
     # Set obsolete keystone auth configs for backward compatibility
112 
-    iniset $SAHARA_CONF_FILE DEFAULT os_auth_host $KEYSTONE_SERVICE_HOST
113 
-    iniset $SAHARA_CONF_FILE DEFAULT os_auth_port $KEYSTONE_SERVICE_PORT
114 
-    iniset $SAHARA_CONF_FILE DEFAULT os_auth_protocol $KEYSTONE_SERVICE_PROTOCOL
112 
+    iniset $SAHARA_CONF_FILE DEFAULT os_auth_host $KEYSTONE_AUTH_HOST
113 
+    iniset $SAHARA_CONF_FILE DEFAULT os_auth_port $KEYSTONE_AUTH_PORT
114 
+    iniset $SAHARA_CONF_FILE DEFAULT os_auth_protocol $KEYSTONE_AUTH_PROTOCOL
115 115 
     iniset $SAHARA_CONF_FILE DEFAULT os_admin_password $SERVICE_PASSWORD
116 116 
     iniset $SAHARA_CONF_FILE DEFAULT os_admin_username sahara
117 117 
     iniset $SAHARA_CONF_FILE DEFAULT os_admin_tenant_name $SERVICE_TENANT_NAME
118 118
119 119 
     # Set actual keystone auth configs
120 120 
     iniset $SAHARA_CONF_FILE keystone_authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/
121 
+    iniset $SAHARA_CONF_FILE keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
122 
+    iniset $SAHARA_CONF_FILE keystone_authtoken auth_port $KEYSTONE_AUTH_PORT
123 
+    iniset $SAHARA_CONF_FILE keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
121 124 
     iniset $SAHARA_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
122 125 
     iniset $SAHARA_CONF_FILE keystone_authtoken admin_user sahara
123 126 
     iniset $SAHARA_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD