From cdae86a7472093ed1d4ebb3e781e64b4a38c8f5a Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 3 Mar 2020 10:12:01 +0000
Subject: [PATCH] CI: Add Ceph groups back to inventory
Following I21dd51c82534704f31ca8d3f72cb2587ee216cd9, the test inventory
was synced with the multinode inventory. This removed some temporary
ceph groups used by the ceph-ansible-upgrade jobs, and broke them. This
change adds the groups back.
Change-Id: I37379258447ffde6b083f4e8d9a1644bc17cd165
---
tests/templates/inventory.j2 | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/tests/templates/inventory.j2 b/tests/templates/inventory.j2
index 6c0f22cff..6b0c01e8c 100644
--- a/tests/templates/inventory.j2
+++ b/tests/templates/inventory.j2
@@ -187,6 +187,12 @@ control
[solum:children]
control
+{# TODO(mnasiadka): Remove in Victoria #}
+{% if scenario == 'ceph-ansible' and is_previous_release and previous_release == 'train' %}
+[ceph:children]
+control
+{% endif %}
+
[ironic:children]
control
@@ -344,6 +350,29 @@ neutron
[ironic-neutron-agent:children]
neutron
+
+{# TODO(mnasiadka): Remove in Victoria #}
+{% if scenario == 'ceph-ansible' and is_previous_release and previous_release == 'train' %}
+# Ceph
+[ceph-mds:children]
+ceph
+
+[ceph-mgr:children]
+ceph
+
+[ceph-nfs:children]
+ceph
+
+[ceph-mon:children]
+ceph
+
+[ceph-rgw:children]
+ceph
+
+[ceph-osd:children]
+storage
+{% endif %}
+
# Cinder
[cinder-api:children]
cinder
--
GitLab