Browse code

Merge "Multi-node setup: Fix keystone host"

Jenkins authored on 2013/03/26 01:21:13
Showing 1 changed files
... ...
@@ -224,9 +224,9 @@ function configure_nova() {
224 224
         # Get the sample configuration file in place
225 225
         cp $NOVA_DIR/etc/nova/api-paste.ini $NOVA_CONF_DIR
226 226
 
227
-        iniset $NOVA_API_PASTE_INI filter:authtoken auth_host $SERVICE_HOST
227
+        iniset $NOVA_API_PASTE_INI filter:authtoken auth_host $KEYSTONE_AUTH_HOST
228 228
         if is_service_enabled tls-proxy; then
229
-            iniset $NOVA_API_PASTE_INI filter:authtoken auth_protocol $SERVICE_PROTOCOL
229
+            iniset $NOVA_API_PASTE_INI filter:authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
230 230
         fi
231 231
         iniset $NOVA_API_PASTE_INI filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME
232 232
         iniset $NOVA_API_PASTE_INI filter:authtoken admin_user nova