diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-11 16:13:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 16:13:11 -0800 |
| commit | cf1c664948b6c3aaf57bad485fdd1daa201d9c8c (patch) | |
| tree | 409b82d7d614dad2fb80eb8b794f6667f8679132 /roles/flannel_register | |
| parent | 24a48f8ed440b808265982d848a0af050920d73c (diff) | |
| parent | ed4d3fb42125405f8dd0765b4a42c618a9916f22 (diff) | |
| download | openshift-cf1c664948b6c3aaf57bad485fdd1daa201d9c8c.tar.gz openshift-cf1c664948b6c3aaf57bad485fdd1daa201d9c8c.tar.bz2 openshift-cf1c664948b6c3aaf57bad485fdd1daa201d9c8c.tar.xz openshift-cf1c664948b6c3aaf57bad485fdd1daa201d9c8c.zip | |
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.
Diffstat (limited to 'roles/flannel_register')
| -rw-r--r-- | roles/flannel_register/defaults/main.yaml | 2 |
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" |