From 751d51b536cfb4c2c67176c615672b004e8c43a6 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 3 Aug 2020 09:50:36 +0100
Subject: [PATCH] Fix play hosts for ironic, monasca, neutron, nova

Some plays were not applied to all groups referenced by the services
they deploy. In most cases this works fine, but if the default inventory
is modified this may cause problems where containers are not deployed to
hosts in the missing groups, if they are not a member of other groups
that the play is targeted to.

This change syncs up the play hosts for all services.

Closes-Bug: #1889387

Change-Id: I6b92d8e53a29b06a065e0611840140d09c8a6695
(cherry picked from commit 9bca246b109c6d78753e3185a5b0a85746ad16fd)
---
 ansible/nova.yml | 2 ++
 ansible/site.yml | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ansible/nova.yml b/ansible/nova.yml
index 311a0bb696..116711b49c 100644
--- a/ansible/nova.yml
+++ b/ansible/nova.yml
@@ -116,6 +116,7 @@
   gather_facts: false
   hosts:
     - compute
+    - nova-compute-ironic
     - nova-conductor
     - nova-novncproxy
     - nova-serialproxy
@@ -181,6 +182,7 @@
   gather_facts: false
   hosts:
     - compute
+    - nova-compute-ironic
     - nova-conductor
     - nova-novncproxy
     - nova-serialproxy
diff --git a/ansible/site.yml b/ansible/site.yml
index e7e3457364..ffd32c3701 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -686,6 +686,7 @@
     - ironic-conductor
     - ironic-inspector
     - ironic-pxe
+    - ironic-ipxe
     - '&enable_ironic_True'
   serial: '{{ kolla_serial|default("0") }}'
   roles:
@@ -778,6 +779,8 @@
     - ironic-neutron-agent
     - neutron-metadata-agent
     - neutron-metering-agent
+    - neutron-bgp-dragent
+    - neutron-infoblox-ipam-agent
     - compute
     - manila-share
     - '&enable_neutron_True'
@@ -970,8 +973,9 @@
 - name: Apply role monasca
   gather_facts: false
   hosts:
-    - monasca
-    - monasca-agent
+    - monasca-agent-collector
+    - monasca-agent-forwarder
+    - monasca-agent-statsd
     - monasca-api
     - monasca-grafana
     - monasca-log-api