diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2015-10-16 11:28:42 -0400 |
---|---|---|
committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-11-02 21:57:43 -0500 |
commit | 02a6d993509ac395165c504dba7b92c4f2eb907c (patch) | |
tree | 0ad5c437407025500cf7aef56386e8005dcda6cd /roles/etcd_certificates/vars | |
parent | fcbb48362afb6e9ed196d7833940877bbc0296ae (diff) | |
download | openshift-02a6d993509ac395165c504dba7b92c4f2eb907c.tar.gz openshift-02a6d993509ac395165c504dba7b92c4f2eb907c.tar.bz2 openshift-02a6d993509ac395165c504dba7b92c4f2eb907c.tar.xz openshift-02a6d993509ac395165c504dba7b92c4f2eb907c.zip |
Fix etcd cert generation when etcd_interface is defined
- Refactor certificate generation to properly accept overrides of etcd_interface
per host and set the certificate SANS and peer URLs properly.
- Add sanity checking to user-set values of etcd_interface to provide a better
error message
Diffstat (limited to 'roles/etcd_certificates/vars')
-rw-r--r-- | roles/etcd_certificates/vars/main.yml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/roles/etcd_certificates/vars/main.yml b/roles/etcd_certificates/vars/main.yml deleted file mode 100644 index 0eaeeb82b..000000000 --- a/roles/etcd_certificates/vars/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -etcd_conf_dir: /etc/etcd -etcd_ca_dir: /etc/etcd/ca -etcd_generated_certs_dir: /etc/etcd/generated_certs -etcd_ca_cert: "{{ etcd_ca_dir }}/ca.crt" -etcd_ca_key: "{{ etcd_ca_dir }}/ca.key" -etcd_openssl_conf: "{{ etcd_ca_dir }}/openssl.cnf" -etcd_ca_name: etcd_ca -etcd_req_ext: etcd_v3_req -etcd_ca_exts_peer: etcd_v3_ca_peer -etcd_ca_exts_server: etcd_v3_ca_server |