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 /roles/openshift_node_upgrade | |
| 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 'roles/openshift_node_upgrade')
| -rw-r--r-- | roles/openshift_node_upgrade/tasks/main.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/roles/openshift_node_upgrade/tasks/main.yml b/roles/openshift_node_upgrade/tasks/main.yml index c1c9e0062..66c1fcc38 100644 --- a/roles/openshift_node_upgrade/tasks/main.yml +++ b/roles/openshift_node_upgrade/tasks/main.yml @@ -69,8 +69,6 @@ file: path: "/etc/systemd/system/docker.service.d/docker-sdn-ovs.conf" state: absent - when: (deployment_type == 'openshift-enterprise' and openshift_release | version_compare('3.4', '>=')) - or (deployment_type == 'origin' and openshift_release | version_compare('1.4', '>=')) - include: containerized_node_upgrade.yml when: openshift.common.is_containerized | bool |