commit b245c5d21c4eee77e4649e0115d579b7e28c9851
author Dan Prince <dprince@redhat.com> Wed Oct 30 15:11:08 2013 -0400
committer Dan Prince <dprince@redhat.com> Wed Oct 30 15:46:54 2013 -0400
tree c491e0d01aaec784bba9f343ff918d8eedd6f019
parent 1bdc7a67b3c1622fb44f0a5446053567fb77a031

Set Nova auth_proto regardless of tls-proxy.

We actually want to comment out the keystone auth_proto in Nova's
api-paste.ini file regardless of the tls-proxy setting. Likewise
lets always set it in nova.conf as well.

This should fix an issue in trying to get this in:

  https://review.openstack.org/#/c/52825/

Change-Id: I1b8202aa1666cbb6ca13d2f77d50fa0175969266

lib/nova

diff --git a/lib/nova b/lib/nova
index 31f286d..150025f 100644
--- a/lib/nova
+++ b/lib/nova
@@ -221,9 +221,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
@@ -397,9 +395,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