diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-06-22 09:32:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-22 09:32:27 +0200 |
| commit | 44dfe8867150d8fed01e08d02bdf4e5692f3b078 (patch) | |
| tree | 969fc3c79645f64dd1789efa512588329c9ef2f6 /roles | |
| parent | d1e2928a8c1a91e3cfbb345e9e85589a3f260c15 (diff) | |
| parent | 23d5c4b656f5dfe180b98c2f90fc147c88a023a8 (diff) | |
| download | openshift-44dfe8867150d8fed01e08d02bdf4e5692f3b078.tar.gz openshift-44dfe8867150d8fed01e08d02bdf4e5692f3b078.tar.bz2 openshift-44dfe8867150d8fed01e08d02bdf4e5692f3b078.tar.xz openshift-44dfe8867150d8fed01e08d02bdf4e5692f3b078.zip | |
Merge pull request #4505 from ingvagabund/set-proper-etcd-data-dir-for-system-container
set proper etcd_data_dir for system container
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/etcd_common/defaults/main.yml | 2 |
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 |