summaryrefslogtreecommitdiffstats
path: root/roles/etcd_common
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-06-13 05:33:08 -0400
committerGitHub <noreply@github.com>2017-06-13 05:33:08 -0400
commit8603fb127a9e871e491362ad550377971b8d4979 (patch)
tree305a842e94f55660901de411abf73314b7c455d9 /roles/etcd_common
parent08e52a1da5117ac051993f5f1122cd387df752fb (diff)
parent53eeaf60971ab120e1de3c6140d63308495f558f (diff)
downloadopenshift-8603fb127a9e871e491362ad550377971b8d4979.tar.gz
openshift-8603fb127a9e871e491362ad550377971b8d4979.tar.bz2
openshift-8603fb127a9e871e491362ad550377971b8d4979.tar.xz
openshift-8603fb127a9e871e491362ad550377971b8d4979.zip
Merge pull request #4388 from giuseppe/etcd-container-to-system-container
Merged by openshift-bot
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 de0739c3e..14e712fcf 100644
--- a/roles/etcd_common/defaults/main.yml
+++ b/roles/etcd_common/defaults/main.yml
@@ -4,7 +4,8 @@ r_etcd_common_etcd_runtime: "docker"
r_etcd_common_embedded_etcd: false
# 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"