From 07a61460e9401926c517830dcd74f553140fd19e Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Tue, 27 Aug 2024 19:36:04 +0530 Subject: [PATCH] Use cifmw_architecture_scenario to set proper automation file https://github.com/openstack-k8s-operators/architecture/pull/375 splits the default vars into different scenario files. We need to fix the reproducer to adapt this change. This pull-request uses cifmw_architecture_scenario to set proper automation file. It drops cifmw_arch_automation_file params from scenario files. Depends-On: https://github.com/openstack-k8s-operators/architecture/pull/375 Signed-off-by: Chandan Kumar (raukadah) --- docs/source/usage/01_usage.md | 2 -- roles/reproducer/tasks/configure_controller.yml | 2 +- scenarios/reproducers/bgp-4-racks-3-ocps.yml | 9 --------- scenarios/reproducers/dt-osasinfra.yml | 1 - scenarios/reproducers/va-pidone.yml | 1 - zuul.d/architecture-jobs.yaml | 7 ------- 6 files changed, 1 insertion(+), 21 deletions(-) diff --git a/docs/source/usage/01_usage.md b/docs/source/usage/01_usage.md index 517df9d9ba..0caed9361f 100644 --- a/docs/source/usage/01_usage.md +++ b/docs/source/usage/01_usage.md @@ -44,8 +44,6 @@ are shared among multiple roles: - `cifmw_ssh_keysize`: (Integer) Size of ssh keys that will be injected into the controller in order to connect to the rest of the nodes. Defaults to 521. - `cifmw_architecture_repo`: (String) Path of the architecture repository on the controller node. Defaults to `~/src/github.com/openstack-k8s-operators/architecture` -- `cifmw_arch_automation_file`: (String) Name of the workflow automation file - in the architecture repository. Defaults to `default.yaml` - `cifmw_architecture_scenario`: (String) The selected VA scenario to deploy. - `cifmw_architecture_wait_condition`: (Dict) Structure defining custom wait_conditions for the automation. - `cifmw_architecture_user_kustomize.*`: (Dict) Structures defining user provided kustomization for automation. All these variables are combined together. diff --git a/roles/reproducer/tasks/configure_controller.yml b/roles/reproducer/tasks/configure_controller.yml index 29bff1f602..bf4d14d997 100644 --- a/roles/reproducer/tasks/configure_controller.yml +++ b/roles/reproducer/tasks/configure_controller.yml @@ -409,7 +409,7 @@ ( cifmw_architecture_repo | default(ansible_user_dir+'/src/github.com/openstack-k8s-operators/architecture'), 'automation/vars', - cifmw_arch_automation_file | default('default.yaml') + cifmw_architecture_scenario~'.yaml' ) | ansible.builtin.path_join }} {% endraw %} diff --git a/scenarios/reproducers/bgp-4-racks-3-ocps.yml b/scenarios/reproducers/bgp-4-racks-3-ocps.yml index b21ed6e808..7cb1204ca5 100644 --- a/scenarios/reproducers/bgp-4-racks-3-ocps.yml +++ b/scenarios/reproducers/bgp-4-racks-3-ocps.yml @@ -377,12 +377,3 @@ cifmw_devscripts_enable_ocp_nodes_host_routing: true _arch_repo: "/home/zuul/src/github.com/openstack-k8s-operators/architecture" cifmw_architecture_scenario: bgp cifmw_kustomize_deploy_architecture_examples_path: "examples/dt/" -cifmw_arch_automation_file: "bgp.yaml" -cifmw_architecture_automation_file: >- - {{ - (ansible_user_dir, - 'src/github.com/openstack-k8s-operators', - 'architecture/automation/vars', - cifmw_arch_automation_file) | - path_join - }} diff --git a/scenarios/reproducers/dt-osasinfra.yml b/scenarios/reproducers/dt-osasinfra.yml index d8a81261e5..23e72201da 100644 --- a/scenarios/reproducers/dt-osasinfra.yml +++ b/scenarios/reproducers/dt-osasinfra.yml @@ -1,6 +1,5 @@ --- cifmw_architecture_scenario: osasinfra -cifmw_arch_automation_file: osasinfra.yaml # Automation section. Most of those parameters will be passed to the # controller-0 as-is and be consumed by the `deploy-va.sh` script. diff --git a/scenarios/reproducers/va-pidone.yml b/scenarios/reproducers/va-pidone.yml index 24ccb742e1..1c4c0a0941 100644 --- a/scenarios/reproducers/va-pidone.yml +++ b/scenarios/reproducers/va-pidone.yml @@ -5,7 +5,6 @@ # Framework. Please do not edit them! _arch_repo: "/home/zuul/src/github.com/openstack-k8s-operators/architecture" cifmw_architecture_scenario: pidone -cifmw_arch_automation_file: pidone.yaml # HERE if you want to override kustomization, you can uncomment this parameter # and push the data structure you want to apply. diff --git a/zuul.d/architecture-jobs.yaml b/zuul.d/architecture-jobs.yaml index d4eafcfa5e..4edcdaf601 100644 --- a/zuul.d/architecture-jobs.yaml +++ b/zuul.d/architecture-jobs.yaml @@ -49,13 +49,6 @@ nodeset: centos-9-medium-3x-centos-9-crc-extracted-2-39-0-3xl-vexxhost vars: <<: *architecture_vars - cifmw_architecture_automation_file: >- - {{ - ( - cifmw_architecture_repo, - 'automation/vars/default.yaml' - ) | ansible.builtin.path_join - }} cifmw_controller_name: controller cifmw_openshift_setup_skip_internal_registry_tls_verify: true cifmw_networking_env_def_file: "networking-env-definition.yml"