summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-10-29 23:42:31 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-10-30 00:11:19 -0400
commita9143d5d0e7245e12e0597fa5105fdcbb85e0846 (patch)
tree90c0f2358f3a8be65f5dc3122adc5fbd7c1ac7c7 /roles/openshift_master/templates
parentd25c1ca3b558c3b7ba4b6b37517ca0dcb7d02e22 (diff)
downloadopenshift-a9143d5d0e7245e12e0597fa5105fdcbb85e0846.tar.gz
openshift-a9143d5d0e7245e12e0597fa5105fdcbb85e0846.tar.bz2
openshift-a9143d5d0e7245e12e0597fa5105fdcbb85e0846.tar.xz
openshift-a9143d5d0e7245e12e0597fa5105fdcbb85e0846.zip
Disable OpenShift features if installing Atomic Enterprise
Diffstat (limited to 'roles/openshift_master/templates')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j23
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 527c5231a..73a0bc6cc 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -22,6 +22,9 @@ corsAllowedOrigins:
{% for custom_origin in openshift.master.custom_cors_origins | default("") %}
- {{ custom_origin }}
{% endfor %}
+{% if 'disabled_features' in openshift.master %}
+disabledFeatures: {{ openshift.master.disabled_features | to_json }}
+{% endif %}
{% if openshift.master.embedded_dns | bool %}
dnsConfig:
bindAddress: {{ openshift.master.bind_addr }}:{{ openshift.master.dns_port }}