From 1cbea790e2b0fdd189f92ca76dcf852aedea6d2c Mon Sep 17 00:00:00 2001
From: Sofer Athlan-Guyot <sathlang@redhat.com>
Date: Fri, 2 Feb 2018 13:53:10 +0100
Subject: [PATCH] In mixed version upgrade we don't want yum upgrade to be
 triggered.

We re-use the repo-setup role during the upgrade to create the script
we push in the UpgradeInitCommand[1] command.  We don't want "yum
upgrade -y" to be triggered at that moment.

repo_setup_run_update variable enable us to do that.  We cannot
override the repo_cmd_after because it's an extra variable (passed
using "-e") and it has the highest precedence possible in ansible[2].

[1] currently there https://review.openstack.org/#/c/541621/1/playbooks/multinode-overcloud-upgrade.yml
[2] https://docs.ansible.com/ansible/latest/playbooks_variables.html#variable-precedence-where-should-i-put-a-variable

Change-Id: I4b2f2696d366db766a5ab146cc718ccc4a15c629
---
 .../tripleo-ci/master-undercloud-pike-overcloud.yml        | 7 +++++++
 .../release/tripleo-ci/pike-undercloud-ocata-overcloud.yml | 7 +++++++
 roles/repo-setup/README.md                                 | 3 +++
 roles/repo-setup/defaults/main.yml                         | 2 ++
 4 files changed, 19 insertions(+)

diff --git a/config/release/tripleo-ci/master-undercloud-pike-overcloud.yml b/config/release/tripleo-ci/master-undercloud-pike-overcloud.yml
index 5a8ffec7b..4dce6f912 100644
--- a/config/release/tripleo-ci/master-undercloud-pike-overcloud.yml
+++ b/config/release/tripleo-ci/master-undercloud-pike-overcloud.yml
@@ -127,4 +127,11 @@ repo_cmd_after: |
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   sudo yum repolist;
   sudo yum clean metadata
+  {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
+  {% endif %}
+
+undercloud_rpm_dependencies: >-
+  python-tripleoclient
+  ceph-ansible
+
diff --git a/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml b/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml
index 4ab816d0a..d4b0e7c64 100644
--- a/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml
+++ b/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml
@@ -125,4 +125,11 @@ repo_cmd_after: |
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   sudo yum repolist;
   sudo yum clean metadata
+  {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
+  {% endif %}
+
+undercloud_rpm_dependencies: >-
+  python-tripleoclient
+  ceph-ansible
+
diff --git a/roles/repo-setup/README.md b/roles/repo-setup/README.md
index b024e9b29..33edebd87 100644
--- a/roles/repo-setup/README.md
+++ b/roles/repo-setup/README.md
@@ -27,6 +27,9 @@ Role Variables
 * `add_repos` - dictionary of additional repositories to add, could be populated in code, by
                 default is empty. Note that this dictionary will be constructed in the same manner
                 as a typical `repos` dictionary. See examples below.
+* `repo_setup_run_update` - false/true - whether to run or not yum update after setting up the repo.
+                            Default to true.
+
 
   *File*
   ------
diff --git a/roles/repo-setup/defaults/main.yml b/roles/repo-setup/defaults/main.yml
index 3c16f06e8..e0949a381 100644
--- a/roles/repo-setup/defaults/main.yml
+++ b/roles/repo-setup/defaults/main.yml
@@ -30,6 +30,8 @@ repos:
     filename: delorean-deps.repo
     down_url: https://trunk.rdoproject.org/centos7-{{ release }}/delorean-deps.repo
 
+repo_setup_run_update: true
+
 # For adding custom repositories in featureset files
 add_repos: []
 # rhsm variables