From 6da6d92d533d3443a1d9b9f6acb92c58023173b0 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 18 Sep 2020 11:36:55 -0700
Subject: [PATCH] Stop using fedora-30

Fedora 30 is old. Fedora 32 is available, lets use it. We use the new
ensure-zookeeper role as Fedora 32 does not have zookeeper packages
anymore.

Co-Authored-By: Tristan Cacqueray <tdecacqu@redhat.com>
Depends-On: https://review.opendev.org/752757
Change-Id: I3b429be1fa90cc8a546e5331a4d9b38a4659a591
---
 .zuul.yaml                                       |  4 +++-
 bindep.txt                                       |  2 +-
 playbooks/nodepool-functional-openshift/run.yaml | 14 +-------------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 1e36a2c38..b662997a4 100644
--- a/.zuul.yaml
+++ b/.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
 
diff --git a/bindep.txt b/bindep.txt
index 26a9ad5fb..f6c019371 100644
--- a/bindep.txt
+++ b/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]
diff --git a/playbooks/nodepool-functional-openshift/run.yaml b/playbooks/nodepool-functional-openshift/run.yaml
index 875c84c35..05abc6412 100644
--- a/playbooks/nodepool-functional-openshift/run.yaml
+++ b/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