From 180897e49ae5ca42ab7b877888a7766e1ca0d731 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Fri, 5 Apr 2019 09:28:51 -0700
Subject: [PATCH] Update zuul servers to puppet 4

This leaves ask.o.o and lists.o.o, which are still running Trusty, and
the cgit servers, which are likely to be decommissioned soon.

Change-Id: I78e7fd9e3079cc760da0aad955f6eeb32d442fc3
---
 inventory/groups.yaml                                     | 8 ++++----
 .../files/inventory_plugins/test-fixtures/results.yaml    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index 9db862e258..e27f90e0a5 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -39,10 +39,6 @@ groups:
     - git.openstack.org
     - git[0-9]*.openstack.org
     - lists*.open*.org
-    - ze[0-9]*.open*.org
-    - zk[0-9]*.open*.org
-    - zm[0-9]*.open*.org
-    - zuul01.open*.org
   gerrit:
     - review-dev[0-9]*.open*.org
     - review[0-9]*.open*.org
@@ -194,6 +190,10 @@ groups:
     - translate-dev[0-9]*.open*.org
     - wiki[0-9]*.openstack.org
     - wiki-dev[0-9]*.openstack.org
+    - ze[0-9]*.open*.org
+    - zk[0-9]*.open*.org
+    - zm[0-9]*.open*.org
+    - zuul01.open*.org
   refstack:
     - refstack*.open*.org
   registry:
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 f1fdd578e4..8cf84f5c94 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
@@ -69,10 +69,10 @@ results:
   ze01.openstack.org:
     - afs-client
     - puppet
+    - puppet4
     - zuul-executor
-    - futureparser
 
   zk01.openstack.org:
     - puppet
+    - puppet4
     - zookeeper
-    - futureparser