Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use cifmw_architecture_scenario to set proper automation file #2333

Merged
merged 1 commit into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions docs/source/usage/01_usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion roles/reproducer/tasks/configure_controller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,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 %}
Expand Down
9 changes: 0 additions & 9 deletions scenarios/reproducers/bgp-4-racks-3-ocps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
}}
1 change: 0 additions & 1 deletion scenarios/reproducers/dt-osasinfra.yml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 0 additions & 1 deletion scenarios/reproducers/va-pidone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down