summaryrefslogtreecommitdiffstats
path: root/roles/flannel
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-12-11 16:13:11 -0800
committerGitHub <noreply@github.com>2017-12-11 16:13:11 -0800
commitcf1c664948b6c3aaf57bad485fdd1daa201d9c8c (patch)
tree409b82d7d614dad2fb80eb8b794f6667f8679132 /roles/flannel
parent24a48f8ed440b808265982d848a0af050920d73c (diff)
parented4d3fb42125405f8dd0765b4a42c618a9916f22 (diff)
downloadopenshift-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')
-rw-r--r--roles/flannel/defaults/main.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/flannel/defaults/main.yaml b/roles/flannel/defaults/main.yaml
index 488b6b0bc..2e4a0dc39 100644
--- a/roles/flannel/defaults/main.yaml
+++ b/roles/flannel/defaults/main.yaml
@@ -2,8 +2,8 @@
flannel_interface: "{{ ansible_default_ipv4.interface }}"
flannel_etcd_key: /openshift.com/network
etcd_hosts: "{{ etcd_urls }}"
-etcd_peer_ca_file: "{{ openshift.common.config_base }}/node/{{ 'ca' if (embedded_etcd | bool) else 'flannel.etcd-ca' }}.crt"
-etcd_peer_cert_file: "{{ openshift.common.config_base }}/node/{{ 'system:node:' + openshift.common.hostname if (embedded_etcd | bool) else 'flannel.etcd-client' }}.crt"
-etcd_peer_key_file: "{{ openshift.common.config_base }}/node/{{ 'system:node:' + openshift.common.hostname if (embedded_etcd | bool) else 'flannel.etcd-client' }}.key"
+etcd_peer_ca_file: "{{ openshift.common.config_base }}/node/flannel.etcd-ca.crt"
+etcd_peer_cert_file: "{{ openshift.common.config_base }}/node/flannel.etcd-client.crt"
+etcd_peer_key_file: "{{ openshift.common.config_base }}/node/flannel.etcd-client.key"
openshift_docker_service_name: "{{ 'container-engine' if (openshift_docker_use_system_container | default(False)) else 'docker' }}"