diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-12-08 17:03:06 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-12-08 17:03:06 -0500 |
| commit | ed4d3fb42125405f8dd0765b4a42c618a9916f22 (patch) | |
| tree | be753393fe1d08e7047a0fedc03a271d7fb91b84 /roles/flannel/defaults | |
| parent | 091acb2cd3d0ab2a6019d9e96a22e6fed1c0ca9a (diff) | |
| download | openshift-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/defaults')
| -rw-r--r-- | roles/flannel/defaults/main.yaml | 6 |
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' }}" |