Browse Source

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
(cherry picked from commit 76b1559d3a)
tags/16.0.0^0
Javier Pena 1 month ago
parent
commit
88f5683a17
3 changed files with 25 additions and 8 deletions
  1. +10
    -2
      .zuul.yaml
  2. +1
    -1
      Puppetfile
  3. +14
    -5
      playbooks/packstack-multinode.yaml

+ 10
- 2
.zuul.yaml View File

@@ -172,18 +172,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


+ 1
- 1
Puppetfile View File

@@ -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',


+ 14
- 5
playbooks/packstack-multinode.yaml View File

@@ -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,21 +45,30 @@
become: true
register: ssh_key

- name: Deploy SSH key on compute node
- name: Deploy SSH key on controller
authorized_key:
user: root
state: present
key: "{{ ssh_key.stdout }}"
delegate_to: "{{ hostvars['compute'].ansible_host }}"
become: true

- name: Deploy SSH key on controller
- 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: "{{ ssh_key.stdout }}"
key: "{{ hostvars['controller'].sshkey }}"
become: true

- hosts: controller
name: packstack-multinode
tasks:
- name: Run Packstack
shell:
cmd: |


Loading…
Cancel
Save