Skip to content

Commit 1f0dbfa

Browse files
committed
WIP Prepare cifmw to run with Zironic
The Zironic tool would pre-deploy OCP cluster before CI job will "pick" the baremetal host. Signed-off-by: Daniel Pawlik <dpawlik@redhat.com>
1 parent 8eeaca4 commit 1f0dbfa

File tree

4 files changed

+9
-0
lines changed

4 files changed

+9
-0
lines changed

reproducer.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@
7575
roles:
7676
- role: reproducer
7777
post_tasks:
78+
- name: Finish reproducer playbook if zironic_deployment
79+
when: zironic_deployment | default(false)
80+
ansible.builtin.meta: end_play
81+
7882
- name: Allow traffic from OSP VMs to OSP API (needed for shiftstack)
7983
become: true
8084
when: cifmw_allow_vms_to_reach_osp_api | default (false) | bool

roles/devscripts/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,4 @@ cifmw_devscripts_cinder_volume_pvs:
7070

7171
cifmw_devscripts_config_overrides: {}
7272
cifmw_devscripts_installer_timeout: 7200 # 2 hours
73+
cifmw_devscripts_zironic_deployment: false

roles/devscripts/tasks/131_packages.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
tasks_from: epel.yml
3131

3232
- name: Ensure conflicting package does not exist.
33+
when: not cifmw_devscripts_zironic_deployment
3334
become: true
3435
ansible.builtin.package:
3536
name: "ansible-core"

roles/dnsmasq/handlers/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
- _dnsmasq.msg is defined
2525
- _dnsmasq.msg is not
2626
match('Could not find the requested service cifmw-dnsmasq.service')
27+
retries: 5
28+
delay: 15
29+
until: _dnsmasq is succeeded
2730

2831
- name: Reload dnsmasq
2932
become: true

0 commit comments

Comments
 (0)