summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2015-11-10 09:51:02 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2015-11-10 10:02:41 -0400
commitd9e8e0ea821a87c3eb924dc89f5cd8de40ce34c8 (patch)
tree35ab50056e4eaed54e4645be6a0de1db8b36b3e8
parentfa67d37245d53f4ea7222b0d4d970ede48fee94b (diff)
downloadopenshift-d9e8e0ea821a87c3eb924dc89f5cd8de40ce34c8.tar.gz
openshift-d9e8e0ea821a87c3eb924dc89f5cd8de40ce34c8.tar.bz2
openshift-d9e8e0ea821a87c3eb924dc89f5cd8de40ce34c8.tar.xz
openshift-d9e8e0ea821a87c3eb924dc89f5cd8de40ce34c8.zip
1279746: Fix leftover disabled features line in config template.
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j21
1 files changed, 0 insertions, 1 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index faf625e3c..bb12a0a0f 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -34,7 +34,6 @@ corsAllowedOrigins:
disabledFeatures: {{ openshift.master.disabled_features | to_json }}
{% endif %}
{% if openshift.master.embedded_dns | bool %}
-disabledFeatures: null
dnsConfig:
bindAddress: {{ openshift.master.bind_addr }}:{{ openshift.master.dns_port }}
bindNetwork: tcp4