Skip to content

Commit b983d9a

Browse files
evallespopenshift-merge-bot[bot]
authored andcommitted
[repo_setup] Updating cifmw_repo_setup_src var to *_url suffix
Moving the var to the *_url suffix for repo urls. Now it's less confussing on how to update the repo location. Signed-off-by: Enrique Vallespi Gil <evallesp@redhat.com>
1 parent b1b7445 commit b983d9a

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

group_vars/all.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ cifmw_repo_url: "{{ cifmw_openstack_k8s_operators_org_url }}/ci-framework"
5959
cifmw_repo_version_pin: "HEAD"
6060

6161
# repo-setup
62-
cifmw_repo_setup_src: "{{ cifmw_openstack_k8s_operators_org_url }}/repo-setup"
62+
cifmw_repo_setup_url: "{{ cifmw_openstack_k8s_operators_org_url }}/repo-setup"
6363
cifmw_repo_setup_version_pin: "HEAD"
6464

6565
# install_yamls

roles/repo_setup/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ using `cifmw_repo_setup_src` role default var.
1818
* `cifmw_repo_setup_dlrn_uri`: (String) DLRN base URI. Defaults to `https://trunk.rdoproject.org/`.
1919
* `cifmw_repo_setup_rdo_mirror`: (String) Address from which to install RDO packages. Defaults to `{{ cifmw_repo_setup_dlrn_uri }}`.
2020
* `cifmw_repo_setup_os_release`: (String) Operating system release. Defaults to `{{ ansible_distribution|lower }}`.
21-
* `cifmw_repo_setup_src`: (String) repo-setup repository location. Defaults to `https://github.com/openstack-k8s-operators/repo-setup`.
21+
* `cifmw_repo_setup_src`: (String) repo-setup repository location. Takes its value from cifmw_repo_setup_url at group_vars/all.yaml, defaults to `https://github.com/openstack-k8s-operators/repo-setup`.
2222
* `cifmw_repo_setup_version`: (string) repo-setup repository version. Takes its value from cifmw_repo_setup_version_pin (from group_vars) if define, defaults to `HEAD`.
2323
* `cifmw_repo_setup_output`: (String) Repository files output. Defaults to `{{ cifmw_repo_setup_basedir }}/artifacts/repositories`.
2424
* `cifmw_repo_setup_additional_repos`: (String) Additional repos(ceph, deps) to enable. Defaults to `''`.

roles/repo_setup/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ cifmw_repo_setup_dlrn_uri: "https://trunk.rdoproject.org/"
2727
cifmw_repo_setup_rdo_mirror: "{{ cifmw_repo_setup_dlrn_uri }}"
2828
cifmw_repo_setup_os_release: "{{ ansible_distribution | lower }}"
2929
cifmw_repo_setup_dist_major_version: "{{ ansible_distribution_major_version }}"
30-
cifmw_repo_setup_src: "https://github.com/openstack-k8s-operators/repo-setup"
30+
cifmw_repo_setup_src: "{{ cifmw_repo_setup_url | default('https://github.com/openstack-k8s-operators/repo-setup') }}"
3131
cifmw_repo_setup_version: "{{ cifmw_repo_setup_version_pin | default('HEAD') }}"
3232
cifmw_repo_setup_output: "{{ cifmw_repo_setup_basedir }}/artifacts/repositories"
3333
cifmw_repo_setup_env: {}

0 commit comments

Comments
 (0)