From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 15 Nov 2016 18:21:14 +0000 (+0000)
Subject: Merge " Enable TLS in the internal network for Barbican API"
X-Git-Tag: opnfv-6.0.0~482
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6661cefcc4ce560318b2b4403f6fafbabf8e1853;p=apex-puppet-tripleo.git

Merge " Enable TLS in the internal network for Barbican API"
---

6661cefcc4ce560318b2b4403f6fafbabf8e1853
diff --cc manifests/haproxy.pp
index e0a8de8,951a6fb..2cd69c5
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@@ -970,9 -970,10 +970,10 @@@ class tripleo::haproxy 
        internal_ip       => hiera('barbican_api_vip', $controller_virtual_ip),
        service_port      => $ports[barbican_api_port],
        ip_addresses      => hiera('barbican_api_node_ips', $controller_hosts_real),
 -      server_names      => hiera('aodh_api_node_names', $controller_hosts_names_real),
 +      server_names      => hiera('barbican_api_node_names', $controller_hosts_names_real),
        public_ssl_port   => $ports[barbican_api_ssl_port],
-       service_network   => $barbican_network
+       service_network   => $barbican_network,
+       member_options    => union($haproxy_member_options, $internal_tls_member_options),
      }
    }