commit aa50a131350a4e047a3a2c22f3bfb5563f6f4ba1
author Jenkins <jenkins@review.openstack.org> Wed Nov 06 03:55:44 2013 +0000
committer Gerrit Code Review <review@openstack.org> Wed Nov 06 03:55:44 2013 +0000
tree 893384e99998ecfaa893c7b8ca6969c0ba7a8b89
parent e8aa8306b1ab3f471c288d5171b31481c742f236
parent 86199fcdfead581a03b453484879d046729a0fcd

Merge "Clean up use of global conf vars in start_nova"

lib/nova

diff --git a/lib/nova b/lib/nova
index e734550..00f977d 100644
--- a/lib/nova
+++ b/lib/nova
@@ -226,9 +226,7 @@
         # Comment out the keystone configs in Nova's api-paste.ini.
         # We are using nova.conf to configure this instead.
         inicomment $NOVA_API_PASTE_INI filter:authtoken auth_host
-        if is_service_enabled tls-proxy; then
-            inicomment $NOVA_API_PASTE_INI filter:authtoken auth_protocol
-        fi
+        inicomment $NOVA_API_PASTE_INI filter:authtoken auth_protocol
         inicomment $NOVA_API_PASTE_INI filter:authtoken admin_tenant_name
         inicomment $NOVA_API_PASTE_INI filter:authtoken admin_user
         inicomment $NOVA_API_PASTE_INI filter:authtoken admin_password
@@ -402,9 +400,7 @@
         # Add keystone authtoken configuration
 
         iniset $NOVA_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
-        if is_service_enabled tls-proxy; then
-            iniset $NOVA_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
-        fi
+        iniset $NOVA_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
         iniset $NOVA_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
         iniset $NOVA_CONF keystone_authtoken admin_user nova
         iniset $NOVA_CONF keystone_authtoken admin_password $SERVICE_PASSWORD