From cb868e8f97292e679c71a9cf19e377952c9f5d32 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen.murphy@suse.de>
Date: Mon, 4 Feb 2019 16:51:25 +0100
Subject: [PATCH] Upgrade some servers to puppet 4

In roughly lexicographical order, upgrade a batch of servers to puppet
4. We skip ask-staging because although it is in the futureparser group
it was temporarily disabled in puppet and so hasn't actually gone
through the futureparser validation stage yet.

Depends-On: https://review.openstack.org/643465
Change-Id: I3971ffb9800e95aaaba0076ec3bd6a05cd92a750
---
 inventory/groups.yaml                            | 16 ++++++++--------
 .../inventory_plugins/test-fixtures/results.yaml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index 43ec71f5eb..f805e0dc29 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -39,14 +39,6 @@ groups:
     - afsdb[0-9]*.open*.org
     - ask*.open*.org
     - ask-staging[0-9]*.open*.org
-    - cacti[0-9]*.open*.org
-    - codesearch[0-9]*.open*.org
-    - eavesdrop[0-9]*.open*.org
-    - elasticsearch[0-9]*.open*.org
-    - ethercalc[0-9]*.open*.org
-    - etherpad[0-9]*.open*.org
-    - files[0-9]*.open*.org
-    - firehose[0-9]*.open*.org
     - git.openstack.org
     - git[0-9]*.openstack.org
     - grafana[0-9]*.open*.org
@@ -185,7 +177,15 @@ groups:
     - zuul[0-9]*.open*.org
     - zk[0-9]*.open*.org
   puppet4:
+    - cacti[0-9]*.open*.org
+    - codesearch[0-9]*.open*.org
+    - eavesdrop[0-9]*.open*.org
+    - elasticsearch[0-9]*.open*.org
+    - ethercalc[0-9]*.open*.org
+    - etherpad[0-9]*.open*.org
     - etherpad-dev[0-9]*.open*.org
+    - files[0-9]*.open*.org
+    - firehose[0-9]*.open*.org
     - groups-dev[0-9]*.open*.org
     - lists-dev[0-9]*.open*.org
     - review-dev[0-9]*.open*.org
diff --git a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
index 4d15e558f5..13bc4761d9 100644
--- a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
+++ b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
@@ -15,8 +15,8 @@ results:
 
   firehose01.openstack.org:
     - firehose
-    - futureparser
     - puppet
+    - puppet4
 
   graphite.openstack.org:
     - graphite