Merge "Upgrade some servers to puppet 4"

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

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