Merge "Stop using fedora-30"

.zuul.yaml

@@ -129,10 +129,12 @@
     run: playbooks/nodepool-functional-openshift/run.yaml
     nodeset:
       nodes:
+        # Runs openshift
         - name: cluster
           label: centos-7
+        # Runs nodepool
         - name: launcher
-          label: fedora-30
+          label: fedora-32
     required-projects:
       - zuul/nodepool
 

bindep.txt

@@ -16,4 +16,4 @@ python3-dev [compile test platform:dpkg]
 python3-devel [compile test platform:rpm]
 sudo
 zookeeperd [platform:dpkg test]
-zookeeper [platform:rpm test]
+zookeeper [platform:suse test]

playbooks/nodepool-functional-openshift/run.yaml

@@ -8,19 +8,7 @@
       command: >
           oc login -u developer -p developer --insecure-skip-tls-verify=true
           https://{{ hostvars['cluster']['ansible_hostname'] }}:8443
-
-    # Zookeeper service doesn't start by default on fedora
-    - name: Setup zoo.cfg
-      command: cp /etc/zookeeper/zoo_sample.cfg /etc/zookeeper/zoo.cfg
-      become: yes
-      ignore_errors: yes
-
-    - name: Start zookeeper
-      service:
-        name: zookeeper
-        state: started
-      become: yes
-      ignore_errors: yes
   roles:
+    - role: ensure-zookeeper
     - role: tox
       tox_envlist: functional_openshift