summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Chaloupka <jchaloup@redhat.com>2017-06-20 12:24:06 +0200
committerJan Chaloupka <jchaloup@redhat.com>2017-06-20 12:27:05 +0200
commit23d5c4b656f5dfe180b98c2f90fc147c88a023a8 (patch)
treecb19cbf93d46f7e6431c7a4cdd9cd698e3d2ca60
parent0b0e0d1ec88af89f6315e1602b30ffe5218c88dc (diff)
downloadopenshift-23d5c4b656f5dfe180b98c2f90fc147c88a023a8.tar.gz
openshift-23d5c4b656f5dfe180b98c2f90fc147c88a023a8.tar.bz2
openshift-23d5c4b656f5dfe180b98c2f90fc147c88a023a8.tar.xz
openshift-23d5c4b656f5dfe180b98c2f90fc147c88a023a8.zip
set proper etcd_data_dir for system container
-rw-r--r--roles/etcd_common/defaults/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/etcd_common/defaults/main.yml b/roles/etcd_common/defaults/main.yml
index 8cc7a9c20..b5b38c1e1 100644
--- a/roles/etcd_common/defaults/main.yml
+++ b/roles/etcd_common/defaults/main.yml
@@ -52,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/' }}"
+etcd_data_dir: "{{ '/var/lib/origin/openshift.local.etcd' if r_etcd_common_embedded_etcd | bool else '/var/lib/etcd/' if openshift.common.etcd_runtime != 'runc' else '/var/lib/etcd/etcd.etcd/' }}"
# etcd ports and protocols
etcd_client_port: 2379