commit 30c8cb3b1bdda695621e0db5674cc55c6c5dd7a8
Author: Francesco Pantano <email address hidden>
Date: Thu Jun 25 13:25:44 2020 +0200
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.
Reviewed: https:/ /review. opendev. org/739043 /git.openstack. org/cgit/ openstack/ puppet- tripleo/ commit/ ?id=30c8cb3b1bd da695621e0db567 4cc55c6c5dd7a8
Committed: https:/
Submitter: Zuul
Branch: stable/ussuri
commit 30c8cb3b1bdda69 5621e0db5674cc5 5c6c5dd7a8
Author: Francesco Pantano <email address hidden>
Date: Thu Jun 25 13:25:44 2020 +0200
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 6203d7a60b564ea a287e5708d6 828a12b823b33e5 e4117bf4c1)
Co-Authored-By: Giulio Fidente <email address hidden>
Change-Id: I70d2ef2a64f0a4
(cherry picked from commit a21b5ee7ce44270