From fa0d4f949ed6a578925e911de9ded5d45325db95 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 21 Mar 2019 14:44:06 -0700
Subject: [PATCH] Update even more servers to puppet4

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

diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index d81575cc56..43610aefc0 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -43,10 +43,6 @@ groups:
     - kdc[0-9]*.open*.org
     - lists*.katacontainers.io
     - lists*.open*.org
-    - logstash-worker[0-9]*.open*.org
-    - logstash[0-9]*.open*.org
-    - mirror-update[0-9]*.open*.org
-    - mirror[0-9]*.*.*.open*.org
     - nb[0-9]*.open*.org
     - nl[0-9]*.open*.org
     - review[0-9]*.open*.org
@@ -175,6 +171,10 @@ groups:
     - groups*.open*.org
     - health[0-9]*.openstack.org
     - lists-dev[0-9]*.open*.org
+    - logstash-worker[0-9]*.open*.org
+    - logstash[0-9]*.open*.org
+    - mirror-update[0-9]*.open*.org
+    - mirror[0-9]*.*.*.open*.org
     - openstackid[0-9]*.openstack.org
     - openstackid-dev[0-9]*.openstack.org
     - paste[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 13bc4761d9..7d75cce9de 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
@@ -29,20 +29,20 @@ results:
     - puppet
 
   logstash-worker02.openstack.org:
-    - futureparser
     - logstash-worker
     - puppet
+    - puppet4
 
   mirror02.dfw.rax.openstack.org:
     - afs-client
     - mirror
     - puppet
-    - futureparser
+    - puppet4
 
   mirror-update01.openstack.org:
     - afsadmin
     - puppet
-    - futureparser
+    - puppet4
 
   review01.openstack.org:
     - futureparser