Move cifmw_installyamls_repos var to group_vars

This commit is one of the steps of replacing common used vars with group_vars to improve overall maintenance of variables in ci-framework

Signed-off-by: Amartya Sinha <[email protected]>

Author: amartyasinha

docs/source/development/02_molecule.md

@@ -74,7 +74,6 @@ cifmw_internal_registry_login: false
 cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
 cifmw_openshift_setup_skip_internal_registry: true
 cifmw_artifacts_basedir: "{{ ansible_user_dir }}/ci-framework-data/artifacts "
-cifmw_installyamls_repos: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/install_yamls"
 nodepool:
   cloud: ""
 mol_config_dir: /home/$(whoami)/src/github.com/openstack-k8s-operators/ci-framework/.config/molecule/config_local.yml

group_vars/all.yml

@@ -5,3 +5,6 @@
 ansible_user_dir: "{{ lookup('env', 'HOME') }}"
 cifmw_project_dir: src/github.com/openstack-k8s-operators/ci-framework
 cifmw_project_dir_absolute: "{{ ansible_user_dir }}/{{ cifmw_project_dir }}"
+cifmw_installyamls_repos_relative: src/github.com/openstack-k8s-operators/install_yamls
+# since cifmw_installyamls_repos var already exists, let's use that and move all definition here in single place instead of creating another variable.
+cifmw_installyamls_repos: "{{ ansible_user_dir }}/{{ cifmw_installyamls_repos_relative }}"

plugins/modules/generate_make_tasks.py

@@ -42,7 +42,7 @@
 
 - name: Generate make tasks
   generate_make_tasks:
-    install_yamls_path: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/install_yamls/"
+    install_yamls_path: "{{ cifmw_installyamls_repos }}"
     output_directory: "{{ ansible_user_dir }}/make_installyamls/tasks"
 """  # noqa
 

roles/edpm_deploy/molecule/default/prepare.yml

@@ -20,7 +20,6 @@
   vars:
     ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_install_yamls_tasks_out: "{{ ansible_user_dir }}/zuul-jobs/roles/install_yamls_makes/tasks"
-    cifmw_installyamls_repos: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/install_yamls"
     cifmw_install_yamls_defaults:
       NAMESPACE: openstack
   roles:

roles/edpm_deploy_baremetal/molecule/default/prepare.yml

@@ -21,7 +21,6 @@
     ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
     cifmw_install_yamls_tasks_out: "{{ ansible_user_dir }}/zuul-jobs/roles/install_yamls_makes/tasks"
-    cifmw_installyamls_repos: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/install_yamls"
   roles:
     - role: test_deps
     - role: ci_setup

roles/edpm_prepare/molecule/default/prepare.yml

@@ -21,7 +21,6 @@
     ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
     cifmw_install_yamls_tasks_out: "{{ ansible_user_dir }}/zuul-jobs/roles/install_yamls_makes/tasks"
-    cifmw_installyamls_repos: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/install_yamls"
     cifmw_install_yamls_defaults:
       NAMESPACE: openstack
   roles:

roles/install_yamls/README.md

@@ -9,7 +9,7 @@ It contains a set of playbooks to deploy podified control plane.
 * `cifmw_install_yamls_envfile`: (String) Environment file containing all the Makefile overrides. Defaults to `install_yamls`.
 * `cifmw_install_yamls_out_dir`: (String) `install_yamls` output directory to store generated output. Defaults to `{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts"`.
 * `cifmw_install_yamls_vars`: (Dict) A dict containing Makefile overrides.
-* `cifmw_install_yamls_repo`: (String) `install_yamls` repo path. Defaults to `{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/install_yamls`.
+* `cifmw_install_yamls_repo`: (String) `install_yamls` repo path. Defaults to `{{ cifmw_installyamls_repos | default(ansible_user_dir ~ '/src/github.com/openstack-k8s-operators/install_yamls')}}`
 * `cifmw_install_yamls_whitelisted_vars`: (List) Allowed variables in `cifmw_install_yamls_vars` that are not part of `install_yamls` Makefiles.
 * `cifmw_install_yamls_edpm_dir`: (String) Output directory for EDPM related artifacts (OUTPUT_BASEDIR). Defaults to `{{ cifmw_install_yamls_out_dir_basedir ~ '/artifacts/edpm' }}`
 * `cifmw_install_yamls_checkout_openstack_ref`: (String) Enable the checkout from openstack-operator references
@@ -43,7 +43,7 @@ The created role directory contains multiple task files, similar to
   register: "make_crc_storage_status"
   cifmw.general.ci_script:
     output_dir: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts"
-    chdir: "/home/zuul/src/github.com/openstack-k8s-operators/install_yamls"
+    chdir: "{{ cifmw_install_yamls_repo }}"
     script: make crc_storage
     dry_run: "{{ make_crc_storage_dryrun|default(false)|bool }}"
     extra_args: "{{ dict((make_crc_storage_env|default({})), **(make_crc_storage_params|default({}))) }}"
@@ -121,7 +121,7 @@ Let's look at below example:-
       register: "make_ansibleee_cleanup_status"
       cifmw.general.ci_script:
         output_dir: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts"
-        chdir: "/home/zuul/src/github.com/openstack-k8s-operators/install_yamls"
+        chdir: "{{ cifmw_install_yamls_repo }}"
         script: "make ansibleee_cleanup"
         dry_run: "{{ make_ansibleee_cleanup_dryrun|default(false)|bool }}"
         extra_args: "{{ dict((make_ansibleee_cleanup_env|default({})), **(make_ansibleee_cleanup_params|default({}))) }}"

roles/install_yamls/molecule/default/converge.yml

@@ -22,7 +22,7 @@
       namespace: foobar
       openstack_ctlplane: controlplane-yaml-file.yaml
     ansible_user_dir: "{{ lookup('env', 'HOME') }}"
-    cifmw_install_yamls_repo: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/install_yamls"
+    cifmw_install_yamls_repo: "{{ cifmw_installyamls_repos }}"
     zuul:
       branch: main
       items:

roles/reproducer/molecule/crc_layout/converge.yml

@@ -26,7 +26,7 @@
       - src: "/tmp/ipmi-things"
         dest: "/home/zuul/ipmi-things"
     cifmw_basedir: "/opt/basedir"
-    cifmw_install_yamls_repo: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/install_yamls"
+    cifmw_install_yamls_repo: "{{ cifmw_installyamls_repos }}"
     cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
     _networks:
       public:

roles/reproducer/tasks/main.yml

@@ -300,7 +300,7 @@
             _devsetup_path: >-
               {{
                 (
-                  cifmw_install_yamls_repo | default('/home/zuul/src/github.com/openstack-k8s-operators/install_yamls'),
+                  cifmw_installyamls_repos,
                   'devsetup'
                 ) | ansible.builtin.path_join
               }}