From 66573cc1e39f3c71dfb393298cc743490a8f240c Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Fri, 6 Nov 2015 11:07:00 -0500
Subject: apiLevel changes

- remove kubernetesMasterConfig.apiLevels if >= 3.1/1.1
- change apiLevels conditional from using deployment_type to
  version_greater_than_3_1_or_1_1
---
 roles/openshift_master/templates/master.yaml.v1.j2 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'roles')

diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 9547a6945..725151bed 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
@@ -73,11 +73,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' }}
 {# TODO: support overriding masterCount #}
-- 
cgit v1.2.3