openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Simplify FastForwardRepoArgs structure used in FFU repo selection."

Browse Source
This commit is contained in:
Zuul 2018-02-19 20:46:12 +00:00 committed by Gerrit Code Review
commit 97afd58793
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
puppet/services/tripleo-packages.yaml
View File

@ -38,7 +38,7 @@ parameters:
default: 'tripleo-repos'
type: string
FastForwardRepoArgs:
default: {'tripleo_repos': [{'release': 'ocata', 'args': '-b ocata current'}, {'release': 'pike', 'args': '-b pike current'}]}
default: {'tripleo_repos': {'ocata': '-b ocata current', 'pike': '-b pike current'}}
type: json
outputs:
@ -114,9 +114,7 @@ outputs:
args:
chdir: /home/stack/tripleo-repos/
- name: Enable tripleo-repos
command: tripleo-repos {{ cmd_args | join(' ') }}
vars:
cmd_args: "{{ fast_forward_repo_args | json_query('tripleo_repos[?release=='+release+'].args') }}"
command: "tripleo-repos {{ fast_forward_repo_args.tripleo_repos[release] | join(' ') }}"
when:
- step|int == 3
- is_bootstrap_node|bool