diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 14:56:40 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 14:56:40 -0400 |
| commit | 1b4bf065f84a28426a010cdc47669b88d5515e34 (patch) | |
| tree | 4214a6f9977b215eaf1a250147e17838939a9543 /roles/etcd_common/defaults | |
| parent | 5373ca09312ebbd1b7eda749f426e5b185463264 (diff) | |
| parent | add2c9f8b2b64b9a02834c1d321bfecdf3ec7b5b (diff) | |
| download | openshift-1b4bf065f84a28426a010cdc47669b88d5515e34.tar.gz openshift-1b4bf065f84a28426a010cdc47669b88d5515e34.tar.bz2 openshift-1b4bf065f84a28426a010cdc47669b88d5515e34.tar.xz openshift-1b4bf065f84a28426a010cdc47669b88d5515e34.zip | |
Merge pull request #1754 from abutcher/etcd-cert-fixes
Bug 1299065: Fix etcd hostname/ip address handling
Diffstat (limited to 'roles/etcd_common/defaults')
| -rw-r--r-- | roles/etcd_common/defaults/main.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/roles/etcd_common/defaults/main.yml b/roles/etcd_common/defaults/main.yml index 3af509448..1ff1d6ef8 100644 --- a/roles/etcd_common/defaults/main.yml +++ b/roles/etcd_common/defaults/main.yml @@ -1,6 +1,4 @@ --- -etcd_peers_group: oo_etcd_to_config - # etcd server vars etcd_conf_dir: /etc/etcd etcd_ca_file: "{{ etcd_conf_dir }}/ca.crt" @@ -28,3 +26,9 @@ etcd_ca_db: "{{ etcd_ca_dir }}/index.txt" etcd_ca_serial: "{{ etcd_ca_dir }}/serial" etcd_ca_crl_number: "{{ etcd_ca_dir }}/crlnumber" etcd_ca_default_days: 365 + +# etcd server & certificate vars +etcd_hostname: "{{ inventory_hostname }}" +etcd_ip: "{{ ansible_default_ipv4.address }}" +etcd_is_atomic: False +etcd_is_containerized: False |