Move cifmw_architecture_repo 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

group_vars/all.yml

@@ -8,3 +8,5 @@ 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 }}"
+cifmw_architecture_repo_relative: src/github.com/openstack-k8s-operators/architecture
+cifmw_architecture_repo: "{{ ansible_user_dir }}/{{ cifmw_architecture_repo_relative }}"

hooks/playbooks/link2file.yml

@@ -20,13 +20,7 @@
   hosts: "{{ cifmw_target_hook_host | default('localhost') }}"
 
   vars:
-    _base_dir: >-
-      {{
-        (
-          ansible_user_dir,
-          "src/github.com/openstack-k8s-operators/architecture"
-        ) | ansible.builtin.path_join
-      }}
+    _base_dir: "{{ cifmw_architecture_repo }}"
     _link_files: "{{ cifmw_link2file_files | split(',') }}"
 
   tasks:

playbooks/06-deploy-architecture.yml

@@ -169,7 +169,7 @@
         cifmw_architecture_automation_file: >-
           {{
             (
-              cifmw_architecture_repo | default(ansible_user_dir+'/src/github.com/openstack-k8s-operators/architecture'),
+              cifmw_architecture_repo,
               'automation/vars',
               cifmw_architecture_scenario~'.yaml'
             ) | ansible.builtin.path_join

roles/ci_dcn_site/defaults/main.yml

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-ci_dcn_site_arch_repo_path: "{{ cifmw_architecture_repo | default('/home/zuul/src/github.com/openstack-k8s-operators/architecture') }}"
+ci_dcn_site_arch_repo_path: "{{ cifmw_architecture_repo }}"
 ci_dcn_site_arch_path: "{{ ci_dcn_site_arch_repo_path }}/examples/dt/dcn"
 ci_dcn_site_cifmw_repo_path: "{{ cifmw_project_dir_absolute }}"
 ci_dcn_site_search_storage_network_names:

roles/ci_gen_kustomize_values/molecule/default/converge.yml

@@ -21,11 +21,7 @@
     cifmw_architecture_scenario: hci
     cifmw_ci_gen_kustomize_values_basedir: >-
       {{ ansible_user_dir }}/ci-framework-data
-    architecture_repo: >-
-      {{
-        (ansible_user_dir,
-         'src/github.com/openstack-k8s-operators/architecture') | path_join
-      }}
+    architecture_repo: "{{ cifmw_architecture_repo }}"
     artifacts: "{{ cifmw_ci_gen_kustomize_values_basedir }}/artifacts"
     to_kustomize:
       - name: 'ctlplane'

roles/cifmw_setup/tasks/deploy_architecture.yml

@@ -146,7 +146,7 @@
     cifmw_architecture_automation_file: >-
       {{
         (
-          cifmw_architecture_repo | default(ansible_user_dir+'/src/github.com/openstack-k8s-operators/architecture'),
+          cifmw_architecture_repo,
           'automation/vars',
           cifmw_architecture_scenario~'.yaml'
         ) | ansible.builtin.path_join

roles/reproducer/tasks/configure_controller.yml

@@ -426,7 +426,7 @@
           cifmw_architecture_automation_file: >-
             {{
               (
-                cifmw_architecture_repo | default(ansible_user_dir+'/src/github.com/openstack-k8s-operators/architecture'),
+                cifmw_architecture_repo,
                 'automation/vars',
                 cifmw_architecture_scenario~'.yaml'
               ) | ansible.builtin.path_join

roles/reproducer/vars/main.yml

@@ -6,7 +6,7 @@ cifmw_reproducer_default_repositories:
   - src: "https://github.com/openstack-k8s-operators/install_yamls"
     dest: "{{ cifmw_reproducer_controller_user_dir }}/{{ cifmw_installyamls_repos_relative }}"
   - src: "https://github.com/openstack-k8s-operators/architecture"
-    dest: "{{ cifmw_reproducer_controller_user_dir }}/src/github.com/openstack-k8s-operators/architecture"
+    dest: "{{ cifmw_reproducer_controller_user_dir }}/{{ cifmw_architecture_repo_relative }}"
 
 # one place to rule them all
 cifmw_reproducer_nm_dnsmasq: "/etc/NetworkManager/conf.d/zz-dnsmasq.conf"

scenarios/reproducers/bgp-4-racks-3-ocps.yml

@@ -373,6 +373,6 @@ cifmw_devscripts_enable_ocp_nodes_host_routing: true
 # controller-0 as-is and be consumed by the `deploy-va.sh` script.
 # Please note, all paths are on the controller-0, meaning managed by the
 # Framework. Please do not edit them!
-_arch_repo: "{{ cifmw_architecture_repo | default('/home/zuul/src/github.com/openstack-k8s-operators/architecture') }}"
+_arch_repo: "{{ cifmw_architecture_repo }}"
 cifmw_architecture_scenario: bgp
 cifmw_kustomize_deploy_architecture_examples_path: "examples/dt/"

scenarios/reproducers/bgp-l3-xl.yml

@@ -763,7 +763,7 @@ cifmw_devscripts_enable_ocp_nodes_host_routing: true
 # controller-0 as-is and be consumed by the `deploy-va.sh` script.
 # Please note, all paths are on the controller-0, meaning managed by the
 # Framework. Please do not edit them!
-_arch_repo: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/architecture"
+_arch_repo: "{{ cifmw_architecture_repo }}"
 cifmw_architecture_scenario: bgp-l3-xl
 cifmw_kustomize_deploy_architecture_examples_path: "examples/dt/"
 cifmw_arch_automation_file: "bgp-l3-xl.yaml"