diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-08-24 11:44:29 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-08-24 11:44:29 -0400 |
| commit | d1730f70c9330edc55798c94d4c0fe183bd61b9a (patch) | |
| tree | fca2c9b1003e2a1f3a2c85b3d35eafcf9bc7c479 /roles/flannel/defaults | |
| parent | 6b97248962da142512a5783d58cda5da50b21360 (diff) | |
| download | openshift-d1730f70c9330edc55798c94d4c0fe183bd61b9a.tar.gz openshift-d1730f70c9330edc55798c94d4c0fe183bd61b9a.tar.bz2 openshift-d1730f70c9330edc55798c94d4c0fe183bd61b9a.tar.xz openshift-d1730f70c9330edc55798c94d4c0fe183bd61b9a.zip | |
Correct flannel cert variables.
Diffstat (limited to 'roles/flannel/defaults')
| -rw-r--r-- | roles/flannel/defaults/main.yaml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/roles/flannel/defaults/main.yaml b/roles/flannel/defaults/main.yaml index 34cebda9c..988731ef2 100644 --- a/roles/flannel/defaults/main.yaml +++ b/roles/flannel/defaults/main.yaml @@ -2,7 +2,6 @@ flannel_interface: "{{ ansible_default_ipv4.interface }}" flannel_etcd_key: /openshift.com/network etcd_hosts: "{{ etcd_urls }}" -etcd_conf_dir: "{{ openshift.common.config_base }}/node" -etcd_peer_ca_file: "{{ etcd_conf_dir }}/{{ 'ca' if (embedded_etcd | bool) else 'node.etcd-ca' }}.crt" -etcd_peer_cert_file: "{{ etcd_conf_dir }}/{{ 'system:node:' + openshift.common.hostname if (embedded_etcd | bool) else 'node.etcd-client' }}.crt" -etcd_peer_key_file: "{{ etcd_conf_dir }}/{{ 'system:node:' + openshift.common.hostname if (embedded_etcd | bool) else 'node.etcd-client' }}.key" +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" |