From: Rob Crittenden <rcritten@redhat.com>
Date: Wed, 28 Jun 2017 19:47:20 +0000 (-0400)
Subject: Merge the nova HAproxy TLS options
X-Git-Tag: opnfv-6.0.0~124^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=90eed9d6a01000377eeadddb07a9e8d57163fe17;p=apex-puppet-tripleo.git

Merge the nova HAproxy TLS options

This makes sure that we set the necessary options so HAProxy uses TLS
to contact nova.  It was commented out when nova was moved to not run
over httpd. Since that is no longer the case we can re-enable it.

Change-Id: I026a7dab30b00a4e93966f650f098c570b0b624b
Depends-On: Iac35b7ddcd8a800901548c75ca8d5083ad17e4d3
---

diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 2f29674..e12ae77 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -1048,7 +1048,7 @@ class tripleo::haproxy (
       mode              => 'http',
       public_ssl_port   => $ports[nova_api_ssl_port],
       service_network   => $nova_osapi_network,
-      #member_options    => union($haproxy_member_options, $internal_tls_member_options),
+      member_options    => union($haproxy_member_options, $internal_tls_member_options),
     }
   }