diff options
| author | Sylvain Baubeau <sbaubeau@redhat.com> | 2015-10-19 15:50:07 +0200 |
|---|---|---|
| committer | Sylvain Baubeau <sbaubeau@redhat.com> | 2015-10-27 17:42:57 +0100 |
| commit | bb30f53935399fee9dcaf42664fe8678dd157ee1 (patch) | |
| tree | ae0d03eda04aa53228efb157816b53eeb3a090e4 /roles | |
| parent | 490c50fe358a88d7ebdf3f473a2fb3131d6773c9 (diff) | |
| download | openshift-bb30f53935399fee9dcaf42664fe8678dd157ee1.tar.gz openshift-bb30f53935399fee9dcaf42664fe8678dd157ee1.tar.bz2 openshift-bb30f53935399fee9dcaf42664fe8678dd157ee1.tar.xz openshift-bb30f53935399fee9dcaf42664fe8678dd157ee1.zip | |
Generate etcd certificats for flannel when is not embedded
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/flannel/defaults/main.yaml | 6 | ||||
| -rw-r--r-- | roles/flannel_register/defaults/main.yaml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/flannel/defaults/main.yaml b/roles/flannel/defaults/main.yaml index a9acab634..34cebda9c 100644 --- a/roles/flannel/defaults/main.yaml +++ b/roles/flannel/defaults/main.yaml @@ -3,6 +3,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.crt" -etcd_peer_cert_file: "{{ etcd_conf_dir }}/system:node:{{ openshift.common.hostname }}.crt" -etcd_peer_key_file: "{{ etcd_conf_dir }}/system:node:{{ openshift.common.hostname }}.key" +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" diff --git a/roles/flannel_register/defaults/main.yaml b/roles/flannel_register/defaults/main.yaml index e4b06b49b..7a454d1d2 100644 --- a/roles/flannel_register/defaults/main.yaml +++ b/roles/flannel_register/defaults/main.yaml @@ -5,7 +5,7 @@ flannel_subnet_len: "{{ subnet_len | default(24, true) }}" 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" +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_cert_file: "{{ etcd_conf_dir }}/master.etcd-client.crt" etcd_peer_key_file: "{{ etcd_conf_dir }}/master.etcd-client.key" |