diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-10 14:41:31 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-10 14:41:31 -0500 |
| commit | 12affae5218733a64ee59637d43e6ae4d84a2f1b (patch) | |
| tree | 449c2e74384373dfc4695fa0e68e224202e64f1b /roles/openshift_master | |
| parent | 35c3b7d15cfac7da748382dc4ad429ca78e7c74e (diff) | |
| parent | 28d601beeebaacd5e79b3fec336a283c8bf20e68 (diff) | |
| download | openshift-12affae5218733a64ee59637d43e6ae4d84a2f1b.tar.gz openshift-12affae5218733a64ee59637d43e6ae4d84a2f1b.tar.bz2 openshift-12affae5218733a64ee59637d43e6ae4d84a2f1b.tar.xz openshift-12affae5218733a64ee59637d43e6ae4d84a2f1b.zip | |
Merge pull request #854 from dgoodwin/pkg-ansible-cfg
Package the default ansible.cfg with atomic-openshift-utils.
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 1 |
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 |