diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-24 16:13:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 16:13:11 -0400 |
| commit | 42960fa87d7dca565e8a4df5da1541b9905cccd8 (patch) | |
| tree | fb18b71901a42e99aad50caaf9419f1b1ddda7aa /roles/flannel/defaults | |
| parent | 476bb76ea251a54ac1d4dc43622bda9831f499bc (diff) | |
| parent | d1730f70c9330edc55798c94d4c0fe183bd61b9a (diff) | |
| download | openshift-42960fa87d7dca565e8a4df5da1541b9905cccd8.tar.gz openshift-42960fa87d7dca565e8a4df5da1541b9905cccd8.tar.bz2 openshift-42960fa87d7dca565e8a4df5da1541b9905cccd8.tar.xz openshift-42960fa87d7dca565e8a4df5da1541b9905cccd8.zip | |
Merge pull request #2359 from abutcher/flannel-certs
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" |