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/templates | |
| 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/templates')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 4 | ||||
| -rw-r--r-- | roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 1eeab46fe..813a58d60 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -1,5 +1,5 @@ apiLevels: -{% if not openshift.common.version_greater_than_3_1_or_1_1 | bool %} +{% if not openshift.common.version_gte_3_1_or_1_1 | bool %} - v1beta3 {% endif %} - v1 @@ -91,7 +91,7 @@ kubeletClientInfo: port: 10250 {% if openshift.master.embedded_kube | bool %} kubernetesMasterConfig: -{% if not openshift.common.version_greater_than_3_1_or_1_1 | bool %} +{% if not openshift.common.version_gte_3_1_or_1_1 | bool %} apiLevels: - v1beta3 - v1 diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 index e6e97b24f..b393bb9ff 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 @@ -7,7 +7,7 @@ Before={{ openshift.common.service_type }}-node.service Requires=network.target [Service] -{% if openshift.common.version_greater_than_3_1_1_or_1_1_1 | bool %} +{% if openshift.common.version_gte_3_1_1_or_1_1_1 | bool %} Type=notify {% else %} Type=simple |