openstack/puppet-tripleo
Code Issues Proposed changes

haproxy: enable UI on containerized undercloud

Browse Source 
TripleO UI endpoint was never enabled in HAproxy because enable_ui is
for instack-undercloud.
It should be tripleo_ui_enabled to follow the pattern with other
services, and be automatically set to True when the service is actually
enabled, which is the case of the containerized undercloud.

For backward compatibility, we'll keep support for enable_ui and use
pick to find which one is defined, otherwise we'll just disable it like
before.

Change-Id: I2f9ef89b6daac2dec4e2af110f5d239a3611f747
This commit is contained in:
Emilien Macchi
2018-04-11 17:42:35 -07:00
parent ba1cbbc77f
commit 001f5633a5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/haproxy.pp
View File

@@ -646,7 +646,8 @@ class tripleo::haproxy (
$ovn_dbs = hiera('ovn_dbs_enabled', false),
$ovn_dbs_manage_lb = false,
$zaqar_ws = hiera('zaqar_api_enabled', false),
$ui = hiera('enable_ui', false),
# For backward compatibility with instack-undercloud, keep enable_ui support)
$ui = pick(hiera('tripleo_ui_enabled', undef), hiera('enable_ui', undef), false),
$aodh_network = hiera('aodh_api_network', undef),
$barbican_network = hiera('barbican_api_network', false),
$ceph_rgw_network = hiera('ceph_rgw_network', undef),