summaryrefslogtreecommitdiffstats
path: root/roles/etcd_common
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-06-07 16:01:02 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-06-08 17:36:02 +0200
commiteca2dfb1caf0ea96e4e8d280f50f60832bf0cf9f (patch)
treecde4169b5185cb09f05a1d3b93e751b8aa6a8405 /roles/etcd_common
parent7c6d6a7e1bba389ebbeec5fd5170a8b8dff6c442 (diff)
downloadopenshift-eca2dfb1caf0ea96e4e8d280f50f60832bf0cf9f.tar.gz
openshift-eca2dfb1caf0ea96e4e8d280f50f60832bf0cf9f.tar.bz2
openshift-eca2dfb1caf0ea96e4e8d280f50f60832bf0cf9f.tar.xz
openshift-eca2dfb1caf0ea96e4e8d280f50f60832bf0cf9f.zip
etcd: define data dir location for the system container
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles/etcd_common')
-rw-r--r--roles/etcd_common/defaults/main.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/etcd_common/defaults/main.yml b/roles/etcd_common/defaults/main.yml
index e1a080b34..cb3013e39 100644
--- a/roles/etcd_common/defaults/main.yml
+++ b/roles/etcd_common/defaults/main.yml
@@ -3,7 +3,8 @@
r_etcd_common_etcd_runtime: "docker"
# etcd server vars
-etcd_conf_dir: "{{ '/etc/etcd' if r_etcd_common_etcd_runtime != 'runc' else '/var/lib/etcd/etcd.etcd/etc' }}"
+etcd_conf_dir: '/etc/etcd'
+r_etcd_common_system_container_host_dir: /var/lib/etcd/etcd.etcd
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"