From b6df8c7ad0ea596b51dc8da814f54f8df5cba64c Mon Sep 17 00:00:00 2001
From: Javier Pena <jpena@redhat.com>
Date: Tue, 26 May 2020 16:31:19 +0200
Subject: [PATCH] Fix CI jobs

- Add jobs removed in [1] to the local configuration.
- Fix SSH key distribution in multinode job. It was broken on a
  recent Zuul update, it seems.
- Update puppetlabs-apache version to 5.4.0

[1] - https://review.opendev.org/730813

Closes-Bug: #1880681
Depends-On: https://review.opendev.org/730813
Change-Id: I2572d92cbaabc1f02fc0790896ccaa3edfc5e6c2
---
 .zuul.yaml                         | 12 ++++++++++--
 Puppetfile                         |  2 +-
 playbooks/packstack-multinode.yaml | 27 ++++++++++++++++++---------
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 0661c577c..046dfb309 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -171,18 +171,26 @@
 - project:
     check:
       jobs:
+        - openstack-tox-pep8
+        - openstack-tox-py36
+        - build-openstack-releasenotes:
+            vars:
+              sphinx_python: python3
         - packstack-centos8-integration-scenario001
         - packstack-centos8-integration-scenario002
         - packstack-centos8-integration-scenario003
         - packstack-centos8-multinode-scenario002-tempest
-        - openstack-tox-py36
     gate:
       jobs:
+        - openstack-tox-pep8
+        - openstack-tox-py36
+        - build-openstack-releasenotes:
+            vars:
+              sphinx_python: python3
         - packstack-centos8-integration-scenario001
         - packstack-centos8-integration-scenario002
         - packstack-centos8-integration-scenario003
         - packstack-centos8-multinode-scenario002-tempest
-        - openstack-tox-py36
     post:
       jobs:
         - packstack-upload-git-mirror
diff --git a/Puppetfile b/Puppetfile
index af3beefaa..039f71b37 100755
--- a/Puppetfile
+++ b/Puppetfile
@@ -102,7 +102,7 @@ mod 'vswitch',
 
 mod 'apache',
   :git => 'https://github.com/puppetlabs/puppetlabs-apache',
-  :ref => 'b4cbc858a61ba2eea4a1178c261a982a59db963d'
+  :ref => 'v5.4.0'
 
 mod 'certmonger',
   :git => 'https://github.com/rcritten/puppet-certmonger',
diff --git a/playbooks/packstack-multinode.yaml b/playbooks/packstack-multinode.yaml
index 3f8cad1a0..e7d6166a6 100644
--- a/playbooks/packstack-multinode.yaml
+++ b/playbooks/packstack-multinode.yaml
@@ -32,7 +32,7 @@
       when: not selinux_enforcing|default("true")|bool
 
 - hosts: controller
-  name: packstack-multinode
+  name: packstack-ssh-preparation-1
   tasks:
     - name: Generate SSH key on controller
       shell: ssh-keygen -t rsa -f /root/.ssh/id_rsa -P ""
@@ -45,14 +45,6 @@
       become: true
       register: ssh_key
 
-    - name: Deploy SSH key on compute node
-      authorized_key:
-        user: root
-        state: present
-        key: "{{ ssh_key.stdout }}"
-      delegate_to: "{{ hostvars['compute'].ansible_host }}"
-      become: true
-
     - name: Deploy SSH key on controller
       authorized_key:
         user: root
@@ -60,6 +52,23 @@
         key: "{{ ssh_key.stdout }}"
       become: true
 
+    - name: Set SSH key fact to be used by the compute node
+      set_fact:
+        sshkey: "{{ ssh_key.stdout }}"
+
+- hosts: compute
+  name: packstack-ssh-preparation-2
+  tasks:
+    - name: Deploy SSH key on compute node
+      authorized_key:
+        user: root
+        state: present
+        key: "{{ hostvars['controller'].sshkey }}"
+      become: true
+
+- hosts: controller
+  name: packstack-multinode
+  tasks:
     - name: Run Packstack
       shell:
         cmd: |