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.
[1] - https://review.opendev.org/730813
Change-Id: I2572d92cbaabc1f02fc0790896ccaa3edfc5e6c2
(cherry picked from commit 76b1559d3a161b0d2326ada77bc69d089639075f)
(cherry picked from commit 100c950bc7
)
This commit is contained in:
parent
4d4f78c2a1
commit
cfffafa906
10
.zuul.yaml
10
.zuul.yaml
|
@ -163,12 +163,22 @@
|
||||||
- project:
|
- project:
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
|
- openstack-tox-pep8
|
||||||
|
- openstack-tox-py27
|
||||||
|
- build-openstack-releasenotes:
|
||||||
|
vars:
|
||||||
|
sphinx_python: python3
|
||||||
- packstack-integration-scenario001-tempest
|
- packstack-integration-scenario001-tempest
|
||||||
- packstack-integration-scenario002-tempest
|
- packstack-integration-scenario002-tempest
|
||||||
- packstack-integration-scenario003-tempest
|
- packstack-integration-scenario003-tempest
|
||||||
- packstack-multinode-scenario002-tempest
|
- packstack-multinode-scenario002-tempest
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
|
- openstack-tox-pep8
|
||||||
|
- openstack-tox-py27
|
||||||
|
- build-openstack-releasenotes:
|
||||||
|
vars:
|
||||||
|
sphinx_python: python3
|
||||||
- packstack-integration-scenario001-tempest
|
- packstack-integration-scenario001-tempest
|
||||||
- packstack-integration-scenario002-tempest
|
- packstack-integration-scenario002-tempest
|
||||||
- packstack-integration-scenario003-tempest
|
- packstack-integration-scenario003-tempest
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
become: true
|
become: true
|
||||||
|
|
||||||
- hosts: controller
|
- hosts: controller
|
||||||
name: packstack-multinode
|
name: packstack-ssh-preparation-1
|
||||||
tasks:
|
tasks:
|
||||||
- name: Generate SSH key on controller
|
- name: Generate SSH key on controller
|
||||||
shell: ssh-keygen -t rsa -f /root/.ssh/id_rsa -P ""
|
shell: ssh-keygen -t rsa -f /root/.ssh/id_rsa -P ""
|
||||||
|
@ -31,14 +31,6 @@
|
||||||
become: true
|
become: true
|
||||||
register: ssh_key
|
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
|
- name: Deploy SSH key on controller
|
||||||
authorized_key:
|
authorized_key:
|
||||||
user: root
|
user: root
|
||||||
|
@ -46,6 +38,23 @@
|
||||||
key: "{{ ssh_key.stdout }}"
|
key: "{{ ssh_key.stdout }}"
|
||||||
become: true
|
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
|
- name: Run Packstack
|
||||||
shell:
|
shell:
|
||||||
cmd: |
|
cmd: |
|
||||||
|
|
Loading…
Reference in New Issue