Merge pull request #6414 from mgugino-upstream-stage/remove-embedded-etcd

Automatic merge from submit-queue.

Remove unneeded embedded etcd logic

Removing some remaining embedded etcd facts except
for the migration plays.

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