Skip to content
Open
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: 2 additions & 0 deletions roles/install_yamls/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ It contains a set of playbooks to deploy podified control plane.

## Parameters

* `cifmw_installyamls_repo_url`: (String) Url of the install_yamls repo. Defaults to `https://github.com/openstack-k8s-operators/install_yamls`.
* `cifmw_install_yamls_version`: (String) Version of the repo to be cloned. Defaults to `HEAD`.
* `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.
Expand Down
2 changes: 2 additions & 0 deletions roles/install_yamls/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ cifmw_install_yamls_edpm_dir: "{{ cifmw_manifests | default(cifmw_install_yamls_
# NAMESPACE: openstack
# METALLB_POOL would be removed once https://github.com/openstack-k8s-operators/install_yamls/pull/356 merges.
cifmw_install_yamls_repo: "{{ cifmw_installyamls_repos | default(ansible_user_dir ~ '/src/github.com/openstack-k8s-operators/install_yamls') }}"
cifmw_installyamls_repo_url: "https://github.com/openstack-k8s-operators/install_yamls"
cifmw_install_yamls_version: "HEAD"
Comment on lines +31 to +32
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we move away from duplicating definitions in both in the defaults and in group_vars like my my comment in #3783 discusses, we can move away from the inconsistent cifmw_installyamls_ vs cifmw_install_yamls prefix situation going on here. We could give the repo_url var here some other name and give it the definition : "{{ cifmw_installyamls_repo_url }}".

cifmw_install_yamls_tasks_out: "{{ cifmw_install_yamls_out_dir }}/roles/install_yamls_makes/tasks"
cifmw_install_yamls_whitelisted_vars:
- DEPLOY_DIR
Expand Down
9 changes: 9 additions & 0 deletions roles/install_yamls/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@
- "{{ cifmw_install_yamls_tasks_out }}"
- "{{ cifmw_basedir }}/artifacts/parameters"

- name: Ensure install_yamls repo is present at the desired version
tags:
- bootstrap
ansible.builtin.git:
repo: "{{ cifmw_installyamls_repo_url }}"
dest: "{{ cifmw_install_yamls_repo }}"
version: "{{ cifmw_install_yamls_version }}"
update: false

- name: Create variables with local repos based on Zuul items
tags:
- bootstrap
Expand Down
Loading