summaryrefslogtreecommitdiffstats
path: root/roles/etcd/defaults
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-10-03 21:50:25 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-10-23 14:20:27 +0200
commit657cf2a8290d7ba1d3307234f7214b09f5fbeb90 (patch)
treea157f9afcde45db4dabac9f84b0d76afa990e06b /roles/etcd/defaults
parent75fc5ef69b792d9595918383286b0d9e45eda848 (diff)
downloadopenshift-657cf2a8290d7ba1d3307234f7214b09f5fbeb90.tar.gz
openshift-657cf2a8290d7ba1d3307234f7214b09f5fbeb90.tar.bz2
openshift-657cf2a8290d7ba1d3307234f7214b09f5fbeb90.tar.xz
openshift-657cf2a8290d7ba1d3307234f7214b09f5fbeb90.zip
etcd: remove hacks for the system container
Use ADDTL_MOUNTS to add a bind mount to the etcd configuration. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles/etcd/defaults')
-rw-r--r--roles/etcd/defaults/main.yaml4
1 files changed, 1 insertions, 3 deletions
diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml
index 78f231416..4b734d4ed 100644
--- a/roles/etcd/defaults/main.yaml
+++ b/roles/etcd/defaults/main.yaml
@@ -13,8 +13,6 @@ r_etcd_common_etcdctl_command: "{{ 'etcdctl' if r_etcd_common_etcd_runtime == 'h
# etcd server vars
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"
etcd_cert_file: "{{ etcd_conf_dir }}/server.crt"
@@ -54,7 +52,7 @@ etcd_is_containerized: False
etcd_is_thirdparty: False
# etcd dir vars
-etcd_data_dir: "{{ '/var/lib/origin/openshift.local.etcd' if r_etcd_common_embedded_etcd | bool else '/var/lib/etcd/' if r_etcd_common_etcd_runtime != 'runc' else '/var/lib/etcd/etcd.etcd/' }}"
+etcd_data_dir: "{{ '/var/lib/origin/openshift.local.etcd' if r_etcd_common_embedded_etcd | bool else '/var/lib/etcd/' }}"
# etcd ports and protocols
etcd_client_port: 2379