tripleo_repos: add tripleo_repos_repo_branch

Allow an user to pull tripleo-repos from master but install TripleO
Train repos.
They'll be able to do that with overriding tripleo_repos_repo_branch to
"master" while tripleo_repos_branch would be set to "train".

Note: if tripleo_repos_repo_branch is undefined, we default to
tripleo_repos_branch.

Change-Id: Ic4aafd9ed1b005354cd55a59868dd8edf7504837
This commit is contained in:
Emilien Macchi 2021-05-06 10:13:57 -04:00
parent cecfd5336b
commit 0f20569b0a
3 changed files with 5 additions and 1 deletions

View File

@ -12,6 +12,7 @@ Role Variables
-------------- --------------
* `tripleo_repos_branch`: (String) Repo branch to configure (master|train|stein|etc) * `tripleo_repos_branch`: (String) Repo branch to configure (master|train|stein|etc)
* `tripleo_repos_repo_branch`: (String) Repo branch to install tripleo-repos tool (master|train|stein|etc)
* `tripleo_repos_debug`: (Boolean) Flag to print out the tripleo-repos command being executed * `tripleo_repos_debug`: (Boolean) Flag to print out the tripleo-repos command being executed
* `tripleo_repos_extra_args`: (List) List of extra arguments to pass to tripleo_repos * `tripleo_repos_extra_args`: (List) List of extra arguments to pass to tripleo_repos
* `tripleo_repos_repo_base`: (String) Url base to RDO (default: <https://trunk.rdoproject.org>) * `tripleo_repos_repo_base`: (String) Url base to RDO (default: <https://trunk.rdoproject.org>)

View File

@ -1,6 +1,7 @@
--- ---
# defaults file for tripleo_repos # defaults file for tripleo_repos
tripleo_repos_branch: master tripleo_repos_branch: master
tripleo_repos_repo_branch:
tripleo_repos_debug: false tripleo_repos_debug: false
tripleo_repos_distro: tripleo_repos_distro:
tripleo_repos_extra_args: [] tripleo_repos_extra_args: []

View File

@ -6,7 +6,9 @@
- name: Build RDO repo url - name: Build RDO repo url
set_fact: set_fact:
_tripleo_repos_repo_url: "{{ tripleo_repos_repo_base }}/{{ _tripleo_repos_distro }}-{{ tripleo_repos_branch }}/{{ _tripleo_repos_component }}/current/" _tripleo_repos_repo_url: >
{{ tripleo_repos_repo_base }}/{{ _tripleo_repos_distro }}-{{ tripleo_repos_repo_branch |
ternary(tripleo_repos_repo_branch, tripleo_repos_branch) }}/{{ _tripleo_repos_component }}/current/
- name: Find available tripleo_repos rpm - name: Find available tripleo_repos rpm
block: block: