[multiple] Post changes after removing playbooks

Update comments in the playbooks, remove relations in Zuul for tracking
removed files, and others that helps to remove the playbooks.

Signed-off-by: Daniel Pawlik <[email protected]>

Author: danpawlik

deploy-edpm.yml

@@ -145,14 +145,6 @@
       ansible.builtin.import_role:
         name: run_hook
 
-    # FIXME:Earlier, where we were using import_playbook, the cifmw_architecture_scenario
-    # variable was not available in playbooks/06-deploy-architecture.yml,
-    # but by using import_playbook, the variables are parsed in different way,
-    # so instead of cifmw_architecture_scenario not being defined, it is defined
-    # and it is executing additional tasks, which should not.
-    # Temporary move the end_play here and let's improve the tasks execution
-    # where tasks execution would be merged into one if the tasks should
-    # be done on same host.
     - name: Early end if not architecture deploy
       tags:
         - always

hooks/playbooks/ceph-deploy.yml

@@ -4,7 +4,6 @@
   hosts: "{{ cifmw_target_hook_host | default('localhost') }}"
   gather_facts: false
   tasks:
-
     - name: Debug cifmw_make_ceph_environment
       when:
         - cifmw_make_ceph_environment is defined
@@ -13,10 +12,6 @@
 
     # Since the hook injects the ansible.cfg in the ansible-playbook command,
     # we therefore should know where to look for the install_yamls_makes role.
-    # For the records, this role is generated in the 01-bootstrap.yml playbook
-    # (migrated to: roles/cifmw_setup/tasks/bootstrap.yml)
-    # by leveraging the install_yamls role and related modules, especially
-    # the generate_make_tasks.
     # And we can pass down the cifmw_make_ceph_environment set in the
     # environment of the main play. If we don't have anything for that param,
     # let's default to an empty hash.

playbooks/validations.yml

@@ -1,4 +1,5 @@
-#
+---
+# TODO: remove this playbook.
 # NOTE: Playbook migrated to: roles/cifmw_setup/tasks/hci_deploy.yml &
 # 06-deploy-architecture.yml.
 # This migration is temporary, and will be further migrated to role.

roles/ci_lvms_storage/README.md

@@ -31,18 +31,18 @@ clean and adds to an LVMS cluster.
 
 If the ci-framework is called and `cifmw_use_lvms` is true, then
 the tasks in role `roles/cifmw_setup/tasks/deploy_architecture.yml`
-and playbook `06-deploy-edpm.yml` call the `ci_lvms_storage` role to create
+and `cifmw_setup/tasks/deploy-edpm.yml` call the `ci_lvms_storage` role to create
 a storage class called `lvms-local-storage` and the `ci_gen_kustomize_values`
 role will set the `storageClass` to `lvms-local-storage` in the generated
 values.yaml files used to build architecture CRs. The Tempest
 CR file, created by the `test_operator` role, will also set its
 `storageClass` value to `lvms-local-storage`.
 
 If the ci-framework is called and `cifmw_use_lvms` is false, then the
-tasks in role `roles/cifmw_setup/tasks/deploy_architecture.yml` and playbook
-`06-deploy-edpm.yml` call the `ci_local_storage` role to create a storage class
-called `local-storage` and the `ci_gen_kustomize_values` role will set
-the `storageClass` to `local-storage` in the generated values.yaml
+tasks in role `roles/cifmw_setup/tasks/deploy_architecture.yml` and
+`cifmw_setup/tasks/deploy-edpm.yml` call the `ci_local_storage` role to create
+a storage class called `local-storage` and the `ci_gen_kustomize_values` role
+will set the `storageClass` to `local-storage` in the generated values.yaml
 files used to build architecture CRs. The Tempest CR file, created by
 the `test_operator` role, will also set its `storageClass` value to
 `local-storage`.

roles/cifmw_setup/tasks/hci_deploy.yml

@@ -23,7 +23,7 @@
         name: run_hook
 
 # If we're doing an architecture deployment, we need to skip validations here.
-# Instead, they will be executed in the 06-deploy-architecture.yml playbook.
+# Instead, they will be executed in the roles/cifmw_setup/tasks/deploy_architecture.yml
 - name: Run validations
   ansible.builtin.include_role:
     name: validations

roles/reproducer/tasks/reuse_main.yaml

@@ -116,18 +116,27 @@
           loop:
             - "{{ cifmw_reproducer_controller_user_dir }}/ansible-bootstrap.log"
 
+        - name: Read inventory file and add it using add_host module
+          vars:
+            include_inventory_file: "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml"
+          ansible.builtin.include_role:
+            name: cifmw_helpers
+            tasks_from: inventory_file.yml
+
         - name: Bootstrap environment on controller-0
           environment:
-            ANSIBLE_LOG_PATH: "~/ansible-bootstrap.log"
+            ANSIBLE_LOG_PATH: "{{ ansible_user_dir }}/ansible-bootstrap.log"
           no_log: "{{ cifmw_nolog | default(true) | bool }}"
-          ansible.builtin.command:
+          ansible.builtin.import_role:
+            name: cifmw_setup
+            tasks_from: bootstrap.yml
+          vars:
+            ansible_extra_vars:
+              - "{{ ansible_user_dir }}/ci-framework-data/parameters/reproducer-variables.yml"
+              - "scenarios/reproducers/networking-definition.yml"
+          changed_when: false
+          args:
             chdir: "{{ _cifmw_reproducer_framework_location }}"
-            cmd: >-
-              ansible-playbook -i ~/ci-framework-data/artifacts/zuul_inventory.yml
-              -e @~/ci-framework-data/parameters/reproducer-variables.yml
-              -e @scenarios/reproducers/networking-definition.yml
-              playbooks/01-bootstrap.yml
-            creates: "{{ cifmw_reproducer_controller_user_dir }}/ansible-bootstrap.log"
 
         - name: Install dev tools from install_yamls on controller-0
           environment:

scenarios/centos-9/ci.yml

@@ -31,8 +31,7 @@ cifmw_run_tests: true
 # The actual ceph_make task understands "make_ceph_environment".
 # But since we're calling it via hook, in order to expose it properly, we
 # have to prefix it with "cifmw_". It will then end in the generated file from
-# 01-bootstrap.yml playbook (custom-params.yml; migrated to
-# roles/cifmw_setup/tasks/bootstrap.yml), and the hook will be able
+# roles/cifmw_setup/tasks/bootstrap.yml, and the hook will be able
 # to load it and consume the parameters properly
 # Check hooks/playbooks/ceph-deploy.yml for the whole logic.
 cifmw_make_ceph_environment:

zuul.d/adoption.yaml

@@ -118,8 +118,6 @@
     parent: adoption-standalone-to-crc-ceph
     files:
       # ci-framework
-      - ^playbooks/02-infra.yml
-      - ^playbooks/06-deploy-edpm.yml
       - ^roles/discover_latest_image/.*
       - ^roles/edpm_prepare/.*
       - ^roles/install_ca/.*

zuul.d/edpm_multinode.yaml

@@ -363,7 +363,6 @@
       - ^hooks/playbooks/control_plane_ceph_backends.yml
       - ^hooks/playbooks/control_plane_hci_pre_deploy.yml
       - ^hooks/playbooks/templates/config_ceph_backends.yaml.j2
-      - ^playbooks/06-deploy-edpm.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).*