Merge "Add barbican profile"

diff --cc manifests/haproxy.pp
index 496581e,e17dc90..d925da0
--- 1/manifests/haproxy.pp
--- 2/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),

diff --cc manifests/profile/base/keystone.pp
Simple merge