From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 1 Nov 2016 12:58:55 +0000 (+0000)
Subject: Merge "Add barbican profile"
X-Git-Tag: opnfv-6.0.0~501
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=47f62da745795d30810952badc82ba089198119d;p=apex-puppet-tripleo.git

Merge "Add barbican profile"
---

47f62da745795d30810952badc82ba089198119d
diff --cc manifests/haproxy.pp
index 496581e,e17dc90..d925da0
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@@ -484,8 -474,8 +495,9 @@@ class tripleo::haproxy 
    $ceph_rgw                    = hiera('ceph_rgw_enabled', false),
    $opendaylight                = hiera('opendaylight_api_enabled', false),
    $zaqar_ws                    = hiera('zaqar_api_enabled', false),
 +  $ui                          = hiera('enable_ui', false),
    $aodh_network                = hiera('aodh_api_network', undef),
+   $barbican_network            = hiera('barbican_api_network', false),
    $ceilometer_network          = hiera('ceilometer_api_network', undef),
    $ceph_rgw_network            = hiera('ceph_rgw_network', undef),
    $cinder_network              = hiera('cinder_api_network', undef),