diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-03-01 22:17:22 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-01 22:17:22 -0500 |
commit | 2d52f7c89baae452f3012102ac0f22a071f8f4ce (patch) | |
tree | feb36c4dd6e8a04fa14a24d88d36b6dacc0fa213 /roles/etcd_common | |
parent | 4a3e61e035e42a260e0bf59d1e0c891dc004d50d (diff) | |
parent | 58818a6af147e457d56a1faf77b02d37bb538826 (diff) | |
download | openshift-2d52f7c89baae452f3012102ac0f22a071f8f4ce.tar.gz openshift-2d52f7c89baae452f3012102ac0f22a071f8f4ce.tar.bz2 openshift-2d52f7c89baae452f3012102ac0f22a071f8f4ce.tar.xz openshift-2d52f7c89baae452f3012102ac0f22a071f8f4ce.zip |
Merge pull request #3393 from srampal/contiv
Pull request for Contiv Ansible code integration into Openshift Ansible
Diffstat (limited to 'roles/etcd_common')
-rw-r--r-- | roles/etcd_common/defaults/main.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/etcd_common/defaults/main.yml b/roles/etcd_common/defaults/main.yml index 2eb9af921..c5efb0a0c 100644 --- a/roles/etcd_common/defaults/main.yml +++ b/roles/etcd_common/defaults/main.yml @@ -2,6 +2,7 @@ # etcd server vars etcd_conf_dir: "{{ '/etc/etcd' if not openshift.common.is_etcd_system_container else '/var/lib/etcd/etcd.etcd/etc' }}" etcd_system_container_conf_dir: /var/lib/etcd/etc +etcd_conf_file: "{{ etcd_conf_dir }}/etcd.conf" etcd_ca_file: "{{ etcd_conf_dir }}/ca.crt" etcd_cert_file: "{{ etcd_conf_dir }}/server.crt" etcd_key_file: "{{ etcd_conf_dir }}/server.key" @@ -33,3 +34,4 @@ etcd_hostname: "{{ inventory_hostname }}" etcd_ip: "{{ ansible_default_ipv4.address }}" etcd_is_atomic: False etcd_is_containerized: False +etcd_is_thirdparty: False |