From 19029070c5aaa5bf2726fce1f1c993bd15f6ff62 Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Fri, 16 Feb 2018 11:43:05 +0100 Subject: [PATCH] Simplify FastForwardRepoArgs structure used in FFU repo selection. The current structure is unnecessarily complex forcing the use of json_query filter with a parameter. The quoting inside that line become hard to read and is currently failing. We change the structure to a simple hash, as this is currently all what is needed. Change-Id: I17f2d1b4e549e275d7d6a675cd522c6b567815ac Closes-Bug: #1749911 --- puppet/services/tripleo-packages.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/puppet/services/tripleo-packages.yaml b/puppet/services/tripleo-packages.yaml index 796483465c..d523f3f73d 100644 --- a/puppet/services/tripleo-packages.yaml +++ b/puppet/services/tripleo-packages.yaml @@ -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