diff --git a/roles/tripleo_repos/README.md b/roles/tripleo_repos/README.md index 42bb4b5..c0d4372 100644 --- a/roles/tripleo_repos/README.md +++ b/roles/tripleo_repos/README.md @@ -12,6 +12,7 @@ Role Variables -------------- * `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_extra_args`: (List) List of extra arguments to pass to tripleo_repos * `tripleo_repos_repo_base`: (String) Url base to RDO (default: ) diff --git a/roles/tripleo_repos/defaults/main.yml b/roles/tripleo_repos/defaults/main.yml index 5b990c4..4651ea8 100644 --- a/roles/tripleo_repos/defaults/main.yml +++ b/roles/tripleo_repos/defaults/main.yml @@ -1,6 +1,7 @@ --- # defaults file for tripleo_repos tripleo_repos_branch: master +tripleo_repos_repo_branch: tripleo_repos_debug: false tripleo_repos_distro: tripleo_repos_extra_args: [] diff --git a/roles/tripleo_repos/tasks/install.yml b/roles/tripleo_repos/tasks/install.yml index 48dcd37..a310d73 100644 --- a/roles/tripleo_repos/tasks/install.yml +++ b/roles/tripleo_repos/tasks/install.yml @@ -6,7 +6,9 @@ - name: Build RDO repo url 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 block: