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_common/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_common/tasks')
| -rw-r--r-- | roles/openshift_common/tasks/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index 98b0b11ea..06e2c0878 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -8,7 +8,7 @@ when: openshift_use_openshift_sdn | default(false) | bool and openshift_use_nuage | default(false) | bool - fail: - msg: Nuage sdn can not be used with flannel + msg: Nuage sdn can not be used with flannel when: openshift_use_flannel | default(false) | bool and openshift_use_nuage | default(false) | bool - fail: @@ -49,7 +49,7 @@ # For enterprise versions < 3.1 and origin versions < 1.1 we want to set the # hostname by default. - set_fact: - set_hostname_default: "{{ not openshift.common.version_greater_than_3_1_or_1_1 }}" + set_hostname_default: "{{ not openshift.common.version_gte_3_1_or_1_1 }}" - name: Set hostname command: > |