From 258ea62f3bb1bfc89eb4e676c77d1610aa067c43 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Tue, 7 Jun 2016 15:17:28 -0300
Subject: Respect image tag/pkg version during upgrade.

---
 roles/openshift_version/tasks/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'roles/openshift_version/tasks')

diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml
index 1cfbff1b0..39accf579 100644
--- a/roles/openshift_version/tasks/main.yml
+++ b/roles/openshift_version/tasks/main.yml
@@ -9,12 +9,12 @@
 - debug: var=openshift_pkg_version
 - debug: var=openshift_image_tag
 
-# Here we protect the version already installed unless something has already set
-# an openshift_version to configure.
+# Protect the installed version by default unless explicitly told not to, or given an
+# openshift_version already.
 - name: Use openshift.common.version fact as version to configure if already installed
   set_fact:
     openshift_version: "{{ openshift.common.version }}"
-  when: openshift.common.version is defined and openshift_version is not defined
+  when: openshift.common.version is defined and openshift_version is not defined and openshift_protect_installed_version
 
 - name: Set openshift_version for rpm installation
   include: set_version_rpm.yml
-- 
cgit v1.2.3