diff options
author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-10 10:14:58 -0500 |
---|---|---|
committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-10 10:14:58 -0500 |
commit | 6f4aeb1039df339e8a4e1500920e078f09c944a3 (patch) | |
tree | f1783601e7d455254c9a12211f1d549eb208f1f0 /roles/openshift_master/tasks | |
parent | a0701fd2d6401acf7dc9eb8c1e711d66b83dc554 (diff) | |
parent | 3e80073b3b9052bedda3850c7844bef50f489ef0 (diff) | |
download | openshift-6f4aeb1039df339e8a4e1500920e078f09c944a3.tar.gz openshift-6f4aeb1039df339e8a4e1500920e078f09c944a3.tar.bz2 openshift-6f4aeb1039df339e8a4e1500920e078f09c944a3.tar.xz openshift-6f4aeb1039df339e8a4e1500920e078f09c944a3.zip |
Merge pull request #1368 from detiber/gte3_2
Add gte check for 3.2, update version checks to gte
Diffstat (limited to 'roles/openshift_master/tasks')
-rw-r--r-- | roles/openshift_master/tasks/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 83f6f7542..3f7701519 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -15,7 +15,7 @@ when: openshift_master_ha | bool and ((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 and openshift_master_cluster_method == "native" and not openshift.common.version_greater_than_3_1_or_1_1 | bool + when: openshift_master_ha | bool and openshift_master_cluster_method == "native" and 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 and openshift_master_cluster_method == "pacemaker" and (openshift_master_cluster_password is not defined or not openshift_master_cluster_password) |