From eca2dfb1caf0ea96e4e8d280f50f60832bf0cf9f Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Wed, 7 Jun 2017 16:01:02 +0200
Subject: etcd: define data dir location for the system container
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
roles/etcd_common/defaults/main.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'roles/etcd_common/defaults')
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"
--
cgit v1.2.3