From 52efe4b5eb135c92b0b6d06147e9219d7aa2a7da Mon Sep 17 00:00:00 2001
From: Sofer Athlan-Guyot <chem@sathlan.org>
Date: Wed, 7 Mar 2018 14:52:06 +0100
Subject: [PATCH] Fix non working repo upgrade command for ffu.

As seen in the related bug, assigning dependent variable in the _vars_
section of Ansible isn't reliable as it's an hash.

Use the same refactor here to simplify the cmd_args assignement.

Change-Id: I53829f8c4461a648553328a92d7b379d8904da95
Related-Bug: #1749911
(cherry picked from commit 688679d60223d675e16494b1a75ff06b6f572df4)
---
 defaults/main.yml                                       | 9 +++------
 tasks/fast-forward-upgrade/create-ffu-scripts.yaml      | 3 +--
 templates/fast-forward-upgrade/undercloud_upgrade.sh.j2 | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 52d132e6..97569234 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -157,12 +157,9 @@ ffu_undercloud_releases: ['ocata', 'pike', 'queens']
 ffu_undercloud_repo_type: tripleo-repos
 ffu_undercloud_repo_args:
   tripleo_repos:
-    - release: ocata
-      args: -b ocata current
-    - release: pike
-      args: -b pike current
-    - release: queens
-      args: -b queens current
+    ocata: "-b ocata current"
+    pike: "-b pike current"
+    queens: "-b queens current"
 
 # Tripleo OOOQ variables.
 composable_scenario: ""
diff --git a/tasks/fast-forward-upgrade/create-ffu-scripts.yaml b/tasks/fast-forward-upgrade/create-ffu-scripts.yaml
index 6b9d5f19..2a3bfc11 100644
--- a/tasks/fast-forward-upgrade/create-ffu-scripts.yaml
+++ b/tasks/fast-forward-upgrade/create-ffu-scripts.yaml
@@ -4,8 +4,7 @@
     dest: "{{ working_dir }}/undercloud_upgrade_{{ release }}.sh"
     mode: 0775
   vars:
-    query: "tripleo_repos[?release=='{{release}}'].args"
-    cmd_args: "{{ ffu_undercloud_repo_args | json_query(query) }}"
+    cmd_args: "{{ ffu_undercloud_repo_args['tripleo_repos'][release]|default('') }}"
 
 - name: create {{ release }} pre undercloud upgrade workaround script
   template:
diff --git a/templates/fast-forward-upgrade/undercloud_upgrade.sh.j2 b/templates/fast-forward-upgrade/undercloud_upgrade.sh.j2
index 71487da9..e838cfa6 100644
--- a/templates/fast-forward-upgrade/undercloud_upgrade.sh.j2
+++ b/templates/fast-forward-upgrade/undercloud_upgrade.sh.j2
@@ -7,7 +7,7 @@ set -euo pipefail
 TRIPLEO_REPOS_RPM=$(curl -L --silent https://trunk.rdoproject.org/centos7/current/ | grep python2-tripleo-repos | awk -F "href" {'print $2'} | awk -F '"' {'print $2'})
 sudo yum localinstall -y https://trunk.rdoproject.org/centos7/current/${TRIPLEO_REPOS_RPM}
 
-sudo tripleo-repos {{ cmd_args | join(' ') }} ceph
+sudo tripleo-repos {{ cmd_args }} ceph
 {% endif %}
 
 {% if release == 'ocata' or release == '11' %}