openstack
/
puppet-tripleo
Code Issues Proposed changes

Fix haproxy ceph dashboard condition 

If grafana is not enabled in the overcloud the
dashboard section shouldn't be created. We
currently hit an issue during upgrades because
the haproxy exists (because of ceph_mgr_enabled)
even though the dashboard bits aren't deployed.
Using the same condition for both services should
be safe enough.

Closes-Bug: #1885122
Co-Authored-By: Giulio Fidente <gfidente@redhat.com>
Change-Id: I70d2ef2a64f0a46203d7a60b564eaa287e5708d6
(cherry picked from commit a21b5ee7ce)
This commit is contained in:
Francesco Pantano 2020-06-25 13:25:44 +02:00 committed by Giulio Fidente
parent 3a564e7e55
commit 30c8cb3b1b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/haproxy.pp
View File

@ -337,7 +337,7 @@
#
# [*ceph_dashboard*]
# (optional) Enable or not Ceph Dashboard binding
# Defaults to hiera('ceph_mgr_enabled', false)
# Defaults to hiera('ceph_grafana_enabled', false)
#
# [*ovn_dbs*]
# (optional) Enable or not OVN northd binding
@ -609,7 +609,7 @@ class tripleo::haproxy (
$aodh = hiera('aodh_api_enabled', false),
$barbican = hiera('barbican_api_enabled', false),
$ceph_grafana = hiera('ceph_grafana_enabled', false),
$ceph_dashboard = hiera('ceph_mgr_enabled', false),
$ceph_dashboard = hiera('ceph_grafana_enabled', false),
$gnocchi = hiera('gnocchi_api_enabled', false),
$mistral = hiera('mistral_api_enabled', false),
$swift_proxy_server = hiera('swift_proxy_enabled', false),