summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster/upgrades
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-10-31 17:21:23 -0400
committerMichael Gugino <mgugino@redhat.com>2017-11-14 16:45:59 -0500
commit346ce4fc595ed618e589666a87b441b40e392e73 (patch)
treeb1ff902f89fad74466bcbab7c0d334a49cb7d813 /playbooks/common/openshift-cluster/upgrades
parenta7462fda03cd9a749f20f0e5885b3dedefd0447e (diff)
downloadopenshift-346ce4fc595ed618e589666a87b441b40e392e73.tar.gz
openshift-346ce4fc595ed618e589666a87b441b40e392e73.tar.bz2
openshift-346ce4fc595ed618e589666a87b441b40e392e73.tar.xz
openshift-346ce4fc595ed618e589666a87b441b40e392e73.zip
Removed old version code
This commit removes any references to versions < 1.5/3.5 We assume the version is always greater than or equal to 1.5/3.5.
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/post_control_plane.yml1
-rw-r--r--playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml1
2 files changed, 0 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
index 122066955..9f93777b4 100644
--- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
@@ -117,7 +117,6 @@
- name: grep pluginOrderOverride
command: grep pluginOrderOverride {{ openshift.common.config_base }}/master/master-config.yaml
register: grep_plugin_order_override
- when: openshift.common.version_gte_3_3_or_1_3 | bool
changed_when: false
failed_when: false
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index a5e2f7940..c5a90d8c2 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -234,7 +234,6 @@
- reconcile_jenkins_role_binding_result.rc == 0
when:
- openshift_version | version_compare('3.7','<')
- - openshift_version | version_compare('3.4','>=')
- when: openshift_upgrade_target | version_compare('3.7','<')
block: