diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-11-15 14:06:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-15 14:06:31 -0500 |
| commit | bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c (patch) | |
| tree | be25d717c47f8e5b2ef495f15d9cedc32c8b15d2 /playbooks/common/openshift-cluster/upgrades | |
| parent | 719e608f81fbf539da0dca16234ef271b9cbe3d3 (diff) | |
| parent | 346ce4fc595ed618e589666a87b441b40e392e73 (diff) | |
| download | openshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.tar.gz openshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.tar.bz2 openshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.tar.xz openshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.zip | |
Merge pull request #5968 from mgugino-upstream-stage/version-scrub
Removed old version code
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/post_control_plane.yml | 1 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 1 |
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 8783ade99..ed97d9993 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -236,7 +236,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: |