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_master/tasks | |
| 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_master/tasks')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index c7c02d49b..b6d3539b1 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -18,12 +18,6 @@ - openshift.master.ha | bool - (openshift.master.cluster_method is not defined) or (openshift.master.cluster_method is defined and openshift.master.cluster_method not in ["native", "pacemaker"]) - fail: - msg: "'native' high availability is not supported for the requested OpenShift version" - when: - - openshift.master.ha | bool - - openshift.master.cluster_method == "native" - - not openshift.common.version_gte_3_1_or_1_1 | bool -- fail: msg: "openshift_master_cluster_password must be set for multi-master installations" when: - openshift.master.ha | bool @@ -222,8 +216,6 @@ when: openshift_master_bootstrap_enabled | default(False) - include: set_loopback_context.yml - when: - - openshift.common.version_gte_3_2_or_1_2 - name: Start and enable master api on first master systemd: |