commit a6601a51eb725a4b0bee843c2861e88befdf0c97
author Mate Lakat <mate.lakat@citrix.com> Wed Mar 13 13:35:47 2013 +0000
committer Mate Lakat <mate.lakat@citrix.com> Fri Mar 15 08:55:22 2013 +0000
tree 254055defd53afefed0b83d45039b175eeaa4a4e
parent e7f0c7be6dae72970610a25f714dbb77e781ef2c

Multi-node setup: Fix keystone host

Fixes bug 1154587.

Use KEYSTONE_AUTH_HOST instead of SERVICE_HOST when setting nova auth
parameters. Also use KEYSTONE_AUTH_PROTOCOL instead of SERVICE_PROTOCOL.

Change-Id: I54f7f31f6b795833b38968f6beea68e429f01d55

lib/nova

diff --git a/lib/nova b/lib/nova
index 13e20f8..bdf5d22 100644
--- a/lib/nova
+++ b/lib/nova
@@ -166,9 +166,9 @@
         # 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