From eca2dfb1caf0ea96e4e8d280f50f60832bf0cf9f Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 7 Jun 2017 16:01:02 +0200 Subject: etcd: define data dir location for the system container Signed-off-by: Giuseppe Scrivano --- roles/openshift_etcd_facts/vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/openshift_etcd_facts/vars/main.yml') diff --git a/roles/openshift_etcd_facts/vars/main.yml b/roles/openshift_etcd_facts/vars/main.yml index 82db36eba..0c072b64a 100644 --- a/roles/openshift_etcd_facts/vars/main.yml +++ b/roles/openshift_etcd_facts/vars/main.yml @@ -5,6 +5,6 @@ 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_peer_url_scheme: https etcd_url_scheme: https -- cgit v1.2.3 From 53eeaf60971ab120e1de3c6140d63308495f558f Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 7 Jun 2017 16:01:57 +0200 Subject: certificates: copy the certificates for the etcd system container Signed-off-by: Giuseppe Scrivano --- roles/openshift_etcd_facts/vars/main.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'roles/openshift_etcd_facts/vars/main.yml') diff --git a/roles/openshift_etcd_facts/vars/main.yml b/roles/openshift_etcd_facts/vars/main.yml index 0c072b64a..b3ecd57a6 100644 --- a/roles/openshift_etcd_facts/vars/main.yml +++ b/roles/openshift_etcd_facts/vars/main.yml @@ -6,5 +6,6 @@ etcd_ip: "{{ openshift.common.ip }}" etcd_cert_subdir: "etcd-{{ openshift.common.hostname }}" etcd_cert_prefix: 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 -- cgit v1.2.3