summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-12-08 17:03:06 -0500
committerMichael Gugino <mgugino@redhat.com>2017-12-08 17:03:06 -0500
commited4d3fb42125405f8dd0765b4a42c618a9916f22 (patch)
treebe753393fe1d08e7047a0fedc03a271d7fb91b84 /roles/openshift_master/templates
parent091acb2cd3d0ab2a6019d9e96a22e6fed1c0ca9a (diff)
downloadopenshift-ed4d3fb42125405f8dd0765b4a42c618a9916f22.tar.gz
openshift-ed4d3fb42125405f8dd0765b4a42c618a9916f22.tar.bz2
openshift-ed4d3fb42125405f8dd0765b4a42c618a9916f22.tar.xz
openshift-ed4d3fb42125405f8dd0765b4a42c618a9916f22.zip
Remove unneeded embedded etcd logic
Removing some remaining embedded etcd facts except for the migration plays.
Diffstat (limited to 'roles/openshift_master/templates')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j218
1 files changed, 1 insertions, 17 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 92668b227..f1a76e5f5 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -69,29 +69,13 @@ dnsConfig:
bindNetwork: tcp4
{% endif %}
etcdClientInfo:
- ca: {{ "ca-bundle.crt" if (openshift.master.embedded_etcd | bool) else "master.etcd-ca.crt" }}
+ ca: master.etcd-ca.crt
certFile: master.etcd-client.crt
keyFile: master.etcd-client.key
urls:
{% for etcd_url in openshift.master.etcd_urls %}
- {{ etcd_url }}
{% endfor %}
-{% if openshift.master.embedded_etcd | bool %}
-etcdConfig:
- address: {{ openshift.common.hostname }}:{{ openshift.master.etcd_port }}
- peerAddress: {{ openshift.common.hostname }}:7001
- peerServingInfo:
- bindAddress: {{ openshift.master.bind_addr }}:7001
- certFile: etcd.server.crt
- clientCA: ca-bundle.crt
- keyFile: etcd.server.key
- servingInfo:
- bindAddress: {{ openshift.master.bind_addr }}:{{ openshift.master.etcd_port }}
- certFile: etcd.server.crt
- clientCA: ca-bundle.crt
- keyFile: etcd.server.key
- storageDirectory: {{ r_openshift_master_data_dir }}/openshift.local.etcd
-{% endif %}
etcdStorageConfig:
kubernetesStoragePrefix: kubernetes.io
kubernetesStorageVersion: v1