From a68197ba7514a5876f426f3bd06f7be6f256bcf4 Mon Sep 17 00:00:00 2001
From: Carlos Goncalves <cgoncalves@redhat.com>
Date: Wed, 12 Dec 2018 18:06:34 +0100
Subject: [PATCH] Fix misnaming of service in firewall rule

On Octavia-enabled composable role deployments where the Octavia health
manager service doesn't run co-located with the API service, the
firewall rule to allow messages in to the o-hm0 interface was not being
created. As a result of that, the load balancers were not going ONLINE.

Conflicts:
    puppet/services/octavia-health-manager.yaml

Closes-Bug: #1808190
Depends-On: https://review.openstack.org/#/c/624403/
Change-Id: Icc568a551b902e6d9f003250226468ed38a776fc
(cherry picked from commit 29da33fae27cd78cf07acbbbbb95914914c782a6)
(cherry picked from commit a74808fafd41c5d12004f50fc336ee47e6575196)
---
 puppet/services/octavia-health-manager.yaml                   | 2 +-
 ...octavia-health-manager-firewall-rule-cdffe31d580ecf4b.yaml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/fix-octavia-health-manager-firewall-rule-cdffe31d580ecf4b.yaml

diff --git a/puppet/services/octavia-health-manager.yaml b/puppet/services/octavia-health-manager.yaml
index b0bab97b90..90e3a72242 100644
--- a/puppet/services/octavia-health-manager.yaml
+++ b/puppet/services/octavia-health-manager.yaml
@@ -79,7 +79,7 @@ outputs:
           - get_attr: [OctaviaBase, role_data, config_settings]
           - octavia::health_manager::heartbeat_key: {get_param: OctaviaHeartbeatKey}
             octavia::health_manager::event_streamer_driver: {get_param: OctaviaEventStreamerDriver}
-            tripleo.octavia_api.firewall_rules:
+            tripleo.octavia_health_manager.firewall_rules:
               '200 octavia health manager interface':
                 proto: udp
                 dport: 5555
diff --git a/releasenotes/notes/fix-octavia-health-manager-firewall-rule-cdffe31d580ecf4b.yaml b/releasenotes/notes/fix-octavia-health-manager-firewall-rule-cdffe31d580ecf4b.yaml
new file mode 100644
index 0000000000..dda21a551c
--- /dev/null
+++ b/releasenotes/notes/fix-octavia-health-manager-firewall-rule-cdffe31d580ecf4b.yaml
@@ -0,0 +1,4 @@
+---
+issues:
+  - Fix misnaming of service in firewall rule for Octavia Health Manager
+    service.