From f97e9ffbbaa2ac1a7428eab4845fa372f52307f8 Mon Sep 17 00:00:00 2001
From: James Denton <james.denton@rackspace.com>
Date: Wed, 5 Sep 2018 18:53:46 +0000
Subject: [PATCH] Only set openvswitch hostname for OVN on eligible hosts

This patch addresses a bug where the OVS 'hostname' external-id was being
set on ineligible hosts due to undefined group matching statements.

Change-Id: I158d6c7da732dada7dc4cf999a2128c02adc189a
Closes-Bug: #1790915
---
 tasks/providers/setup_ovs_ovn.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tasks/providers/setup_ovs_ovn.yml b/tasks/providers/setup_ovs_ovn.yml
index df9958af..7772c06a 100644
--- a/tasks/providers/setup_ovs_ovn.yml
+++ b/tasks/providers/setup_ovs_ovn.yml
@@ -18,6 +18,9 @@
   command: "ovs-vsctl set open_vswitch . external-ids:hostname='{{ inventory_hostname }}'"
   tags:
    - ovn-config
+  when:
+    - (neutron_services['neutron-ovn-northd']['group'] in group_names) or
+      (neutron_services['neutron-ovn-controller']['group'] in group_names)
 
 - name: Create ovsdb-server Listener
   command: "ovs-vsctl set-manager ptcp:6640"