Skip to content

Commit cbce513

Browse files
committed
WIP Move Ceph playbook into hooks
The Ceph playbook should be in hooks instead of main playbook dir. Signed-off-by: Daniel Pawlik <[email protected]>
1 parent a07479f commit cbce513

File tree

6 files changed

+506
-495
lines changed

6 files changed

+506
-495
lines changed

ci/playbooks/edpm/run.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
-i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml"
2424
-e @scenarios/centos-9/base.yml
2525
-e @scenarios/centos-9/edpm_ci.yml
26+
-e @scenarios/centos-9/ceph.yml
2627
{%- if edpm_file.stat.exists %}
2728
-e @{{ ansible_user_dir }}/ci-framework-data/artifacts/edpm-ansible.yml
2829
{%- endif %}

deploy-edpm.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,18 @@
128128
ansible.builtin.meta: clear_facts
129129

130130
# TODO: replace this import_playbook with cifmw_ceph role
131-
- name: Deploy Ceph on target nodes
131+
- name: Run pre_deploy hooks - deploy Ceph on target nodes
132132
vars:
133+
step: pre_deploy
133134
_deploy_ceph: >-
134135
{{
135136
(cifmw_edpm_deploy_hci | default('false') | bool) and
136137
cifmw_architecture_scenario is undefined
137138
}}
138139
storage_network_range: 172.18.0.0/24
139140
storage_mgmt_network_range: 172.20.0.0/24
140-
ansible.builtin.import_playbook: playbooks/ceph.yml
141+
ansible.builtin.import_role:
142+
name: run_hook
141143

142144
- name: Continue HCI deploy
143145
hosts: "{{ cifmw_target_host | default('localhost') }}"

0 commit comments

Comments
 (0)