Correct flannel cert variables.

roles/flannel/README.md

@@ -13,15 +13,15 @@ to 0.3.
 Role Variables
 --------------
 
-| Name                | Default value                           | Description                                   |
-|---------------------|-----------------------------------------|-----------------------------------------------|
-| flannel_interface   | ansible_default_ipv4.interface          | interface to use for inter-host communication |
-| flannel_etcd_key    | /openshift.com/network                  | etcd prefix                                   |
-| etcd_hosts          | etcd_urls                               | a list of etcd endpoints                      |
-| etcd_conf_dir       | {{ openshift.common.config_base }}/node | SSL certificates directory                    |
-| etcd_peer_ca_file   | {{ etcd_conf_dir }}/ca.crt              | SSL CA to use for etcd                        |
-| etcd_peer_cert_file | Openshift SSL cert                      | SSL cert to use for etcd                      |
-| etcd_peer_key_file  | Openshift SSL key                       | SSL key to use for etcd                       |
+| Name                 | Default value                           | Description                                   |
+|----------------------|-----------------------------------------|-----------------------------------------------|
+| flannel_interface    | ansible_default_ipv4.interface          | interface to use for inter-host communication |
+| flannel_etcd_key     | /openshift.com/network                  | etcd prefix                                   |
+| etcd_hosts           | etcd_urls                               | a list of etcd endpoints                      |
+| etcd_cert_config_dir | {{ openshift.common.config_base }}/node | SSL certificates directory                    |
+| etcd_peer_ca_file    | {{ etcd_conf_dir }}/ca.crt              | SSL CA to use for etcd                        |
+| etcd_peer_cert_file  | Openshift SSL cert                      | SSL cert to use for etcd                      |
+| etcd_peer_key_file   | Openshift SSL key                       | SSL key to use for etcd                       |
 
 Dependencies
 ------------

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"