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

@@ -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:

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