summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-07 15:17:28 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-07 15:17:28 -0300
commit258ea62f3bb1bfc89eb4e676c77d1610aa067c43 (patch)
tree0090d9658fb0bfaf7758f1153ba1360cb2084965 /roles
parentdd8501ca8199484531e0a6d2b40139d4085afefa (diff)
downloadopenshift-258ea62f3bb1bfc89eb4e676c77d1610aa067c43.tar.gz
openshift-258ea62f3bb1bfc89eb4e676c77d1610aa067c43.tar.bz2
openshift-258ea62f3bb1bfc89eb4e676c77d1610aa067c43.tar.xz
openshift-258ea62f3bb1bfc89eb4e676c77d1610aa067c43.zip
Respect image tag/pkg version during upgrade.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_version/tasks/main.yml6
1 files changed, 3 insertions, 3 deletions
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