summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-06 16:24:25 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-06 16:24:25 -0500
commit509e39d48ac205d740bb25004db666ad3b66d556 (patch)
treed95d3053b7c60ee53b2690b1b26405593b61ad6b
parentdfc5f881255c3b644a0aeae46070d661039e873f (diff)
parent66573cc1e39f3c71dfb393298cc743490a8f240c (diff)
downloadopenshift-509e39d48ac205d740bb25004db666ad3b66d556.tar.gz
openshift-509e39d48ac205d740bb25004db666ad3b66d556.tar.bz2
openshift-509e39d48ac205d740bb25004db666ad3b66d556.tar.xz
openshift-509e39d48ac205d740bb25004db666ad3b66d556.zip
Merge pull request #830 from detiber/nov1beta3
apiLevel changes
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j26
1 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 d4a6590ea..faf625e3c 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 openshift.common.deployment_type == "enterprise" %}
+{% if not openshift.common.version_greater_than_3_1_or_1_1 | bool %}
- v1beta3
{% endif %}
- v1
@@ -80,11 +80,11 @@ kubeletClientInfo:
port: 10250
{% if openshift.master.embedded_kube | bool %}
kubernetesMasterConfig:
+{% if not openshift.common.version_greater_than_3_1_or_1_1 | bool %}
apiLevels:
-{% if openshift.common.deployment_type == "enterprise" %}
- v1beta3
-{% endif %}
- v1
+{% endif %}
apiServerArguments: {{ api_server_args if api_server_args is defined else 'null' }}
controllerArguments: {{ controller_args if controller_args is defined else 'null' }}
masterCount: {{ openshift.master.master_count }}