summaryrefslogtreecommitdiffstats
path: root/roles/flannel_register/defaults
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/flannel_register/defaults
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/flannel_register/defaults')
-rw-r--r--roles/flannel_register/defaults/main.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/flannel_register/defaults/main.yaml b/roles/flannel_register/defaults/main.yaml
index 1d0f5df6a..cd11fd9ff 100644
--- a/roles/flannel_register/defaults/main.yaml
+++ b/roles/flannel_register/defaults/main.yaml
@@ -4,6 +4,6 @@ flannel_subnet_len: "{{ 32 - (openshift.master.sdn_host_subnet_length | int) }}"
flannel_etcd_key: /openshift.com/network
etcd_hosts: "{{ etcd_urls }}"
etcd_conf_dir: "{{ openshift.common.config_base }}/master"
-etcd_peer_ca_file: "{{ etcd_conf_dir + '/ca.crt' if (openshift.master.embedded_etcd | bool) else etcd_conf_dir + '/master.etcd-ca.crt' }}"
+etcd_peer_ca_file: "{{ etcd_conf_dir + '/master.etcd-ca.crt' }}"
etcd_peer_cert_file: "{{ etcd_conf_dir }}/master.etcd-client.crt"
etcd_peer_key_file: "{{ etcd_conf_dir }}/master.etcd-client.key"