summaryrefslogtreecommitdiffstats
path: root/roles/openshift_etcd_facts/vars/main.yml
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/openshift_etcd_facts/vars/main.yml
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/openshift_etcd_facts/vars/main.yml')
-rw-r--r--roles/openshift_etcd_facts/vars/main.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_etcd_facts/vars/main.yml b/roles/openshift_etcd_facts/vars/main.yml
index 82db36eba..b3ecd57a6 100644
--- a/roles/openshift_etcd_facts/vars/main.yml
+++ b/roles/openshift_etcd_facts/vars/main.yml
@@ -5,6 +5,7 @@ etcd_hostname: "{{ openshift.common.hostname }}"
etcd_ip: "{{ openshift.common.ip }}"
etcd_cert_subdir: "etcd-{{ openshift.common.hostname }}"
etcd_cert_prefix:
-etcd_cert_config_dir: "{{ '/etc/etcd' if not openshift.common.is_etcd_system_container | bool else '/var/lib/etcd/etcd.etcd/etc' }}"
+etcd_cert_config_dir: "/etc/etcd"
+etcd_system_container_cert_config_dir: /var/lib/etcd/etcd.etcd/etc
etcd_peer_url_scheme: https
etcd_url_scheme: https