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]>

Author: danpawlik

deploy-edpm.yml

@@ -127,17 +127,18 @@
       when: cifmw_edpm_deploy_hci | default('false') | bool
       ansible.builtin.meta: clear_facts
 
-# TODO: replace this import_playbook with cifmw_ceph role
-- name: Deploy Ceph on target nodes
-  vars:
-    _deploy_ceph: >-
-      {{
-        (cifmw_edpm_deploy_hci | default('false') | bool) and
-        cifmw_architecture_scenario is undefined
-      }}
-    storage_network_range: 172.18.0.0/24
-    storage_mgmt_network_range: 172.20.0.0/24
-  ansible.builtin.import_playbook: playbooks/ceph.yml
+    - name: Run pre_deploy hooks - deploy Ceph on target nodes
+      vars:
+        step: post_infra
+        _deploy_ceph: >-
+          {{
+            (cifmw_edpm_deploy_hci | default('false') | bool) and
+            cifmw_architecture_scenario is undefined
+          }}
+        storage_network_range: 172.18.0.0/24
+        storage_mgmt_network_range: 172.20.0.0/24
+      ansible.builtin.import_role:
+        name: run_hook
 
 - name: Continue HCI deploy
   hosts: "{{ cifmw_target_host | default('localhost') }}"

hooks/playbooks/ceph-bm.yml

@@ -35,5 +35,6 @@
         {% endfor -%}
         {{ hosts }}
 
+# FIXME: Use hooks in better way
 - name: Deploy Ceph on target nodes
-  ansible.builtin.import_playbook: ../../playbooks/ceph.yml
+  ansible.builtin.import_playbook: ../../hooks/playbooks/ceph.yml

playbooks/ceph.yml renamed to hooks/playbooks/ceph.yml

@@ -131,6 +131,8 @@
       when: cifmw_edpm_deploy_hci | default('false') | bool
       ansible.builtin.meta: clear_facts
 
+# FIXME: This playbook would be removed soon.
+# Here is more like workaround to pass CI.
 - name: Deploy Ceph on target nodes
   vars:
     _deploy_ceph: >-
@@ -140,7 +142,7 @@
       }}
     storage_network_range: 172.18.0.0/24
     storage_mgmt_network_range: 172.20.0.0/24
-  ansible.builtin.import_playbook: ceph.yml
+  ansible.builtin.import_playbook: ../hooks/playbooks/ceph.yml
 
 - name: Continue HCI deploy
   hosts: "{{ cifmw_target_host | default('localhost') }}"

playbooks/06-deploy-edpm.yml

@@ -86,6 +86,7 @@
     insertafter: EOF
   when: ceph_file_stat.stat.exists
 
+# FIXME: Call hooks here
 - name: Deploy Ceph
   cifmw.general.ci_script:
     output_dir: "/home/zuul/ci-framework-data/artifacts"
@@ -95,7 +96,7 @@
       -i ~/ci-framework-data/artifacts/zuul_inventory.yml
       -e @~/ci-framework-data/parameters/reproducer-variables.yml
       -e @~/ci-framework-data/parameters/ceph-{{ _az }}.yml
-      playbooks/ceph.yml
+      hooks/playbooks/ceph.yml
 
 - name: Load the Ceph cluster variables
   ansible.builtin.include_vars:

roles/ci_dcn_site/tasks/ceph.yml

@@ -7,7 +7,7 @@ The
 [openstack-k8s-operators HCI documentation](https://github.com/openstack-k8s-operators/docs/blob/main/hci.md)
 describes how to run Ceph on EDPM nodes but leaves it to the reader
 to install Ceph with `cephadm`. The `cifmw_cephadm` role and
-`ceph.yml` playbook may be used to automate the Ceph installation.
+`hooks/playbooks/ceph.yml` playbook may be used to automate the Ceph installation.
 
 Before this role is run the following roles should be run.
 
@@ -19,7 +19,7 @@ After this role is run, the `cifmw_ceph_client` role can generate
 a k8s CR which OpenStack can use to connect to the deployed Ceph
 cluster.
 
-The `ceph.yml` playbook in the playbooks directory provides a complete
+The `hooks/playbooks/ceph.yml` playbook in the playbooks directory provides a complete
 working example which does all of the above and has been tested on
 a three EDPM node deployment from
 [install_yamls](https://github.com/openstack-k8s-operators/install_yamls).
@@ -29,7 +29,7 @@ Requires an Ansible user who can become root to install Ceph server.
 
 ## Parameters
 
-The `ceph.yml` playbook defaults these parameters so that they do not
+The `hooks/playbooks/ceph.yml` playbook defaults these parameters so that they do not
 need to be changed for a typical EDPM deployment.
 
 * `cifmw_cephadm_default_container`: If this is value is `true`, then
@@ -136,13 +136,13 @@ cifmw_cephadm_keys:
 
 ## Examples
 
-See `ceph.yml` in the playbooks directory.
+See `hooks/playbooks/ceph.yml` in the playbooks directory.
 
 ## Tips for using standalone
 
 ### Pick the appropriate storage network
 
-In the `ceph.yml` playbook, set the `storage_network_range` variable.
+In the `hooks/playbooks/ceph.yml` playbook, set the `storage_network_range` variable.
 
 * If network isolation is not being used, then set the
   `storage_network_range` variable to `192.168.122.0/24` (the default
@@ -198,17 +198,17 @@ export ANSIBLE_HOST_KEY_CHECKING=False
 
 ```
 cd ~/ci-framework/
-ansible-playbook playbooks/ceph.yml
+ansible-playbook hooks/playbooks/ceph.yml
 ```
 
 ## Regarding the disks used as OSDs
 
-By default the `ceph.yml` playbook assumes there are no block devices
+By default the `hooks/playbooks/ceph.yml` playbook assumes there are no block devices
 for Ceph to use and calls the `cifmw_block_device` role to create
 block devices and has the `cifmw_ceph_spec` role configure a spec
 to use the created block devices.
 
-If `cifmw_ceph_spec_data_devices` is passed to the `ceph.yml`
+If `cifmw_ceph_spec_data_devices` is passed to the `hooks/playbooks/ceph.yml`
 playbook, then the `cifmw_block_device` role is not called and
 the spec created by the `cifmw_ceph_spec` role will use whatever
 block devices were passed by `cifmw_ceph_spec_data_devices`. Use

roles/cifmw_cephadm/README.md

@@ -31,7 +31,7 @@ None.
         name: edpm_deploy
 
     - name: Deploy Ceph on edpm nodes
-      ansible.builtin.import_playbook: ceph.yml
+      ansible.builtin.import_playbook: hooks/playbooks/ceph.yml
 
     - name: Prepare for HCI deploy phase 2
       ansible.builtin.import_role:

roles/hci_prepare/README.md

@@ -31,6 +31,11 @@ pre_infra:
     type: playbook
     source: "{{ cifmw_installyamls_repos }}/devsetup/download_tools.yaml"
 
+post_infra:
+  - name: Run ceph hook playbook
+    type: playbook
+    source: ceph.yml
+
 post_ctlplane_deploy:
   - name: Tune rabbitmq resources
     type: playbook

scenarios/centos-9/edpm_ci.yml

@@ -7,6 +7,8 @@
     vars:
       cifmw_extras:
         - '@scenarios/centos-9/nested_virt.yml'
+    files:
+      - '^hooks/playbooks/ceph.yml'
 
 # Virtual Baremetal job with CRC and single compute node.
 - job:

zuul.d/edpm.yaml

@@ -360,7 +360,7 @@
       - ^hooks/playbooks/control_plane_hci_pre_deploy.yml
       - ^hooks/playbooks/templates/config_ceph_backends.yaml.j2
       - ^playbooks/06-deploy-edpm.yml
-      - ^playbooks/ceph.yml
+      - ^hooks/playbooks/ceph.yml
       - ^roles/edpm_deploy/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
       - ^roles/hci_prepare/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
       - ^roles/cifmw_ceph.*/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*