diff options
| author | Giuseppe Scrivano <gscrivano@gnu.org> | 2017-02-10 16:01:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-10 16:01:46 +0100 |
| commit | e1e69ad8346a6938e1d58a852dbf2f8ad28eff6f (patch) | |
| tree | 8cabded134f0423b6d61cf95f00a574539d00db7 /roles/etcd_common | |
| parent | 07ca54fe406a533e70350aa9273d5a3df297f156 (diff) | |
| parent | b84a2cdcbdcbceed8da09485a9e9015378b5818f (diff) | |
| download | openshift-e1e69ad8346a6938e1d58a852dbf2f8ad28eff6f.tar.gz openshift-e1e69ad8346a6938e1d58a852dbf2f8ad28eff6f.tar.bz2 openshift-e1e69ad8346a6938e1d58a852dbf2f8ad28eff6f.tar.xz openshift-e1e69ad8346a6938e1d58a852dbf2f8ad28eff6f.zip | |
Merge pull request #3109 from giuseppe/system-containers
System containers
Diffstat (limited to 'roles/etcd_common')
| -rw-r--r-- | roles/etcd_common/defaults/main.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/etcd_common/defaults/main.yml b/roles/etcd_common/defaults/main.yml index 93633e3e6..2eb9af921 100644 --- a/roles/etcd_common/defaults/main.yml +++ b/roles/etcd_common/defaults/main.yml @@ -1,6 +1,7 @@ --- # etcd server vars -etcd_conf_dir: /etc/etcd +etcd_conf_dir: "{{ '/etc/etcd' if not openshift.common.is_etcd_system_container else '/var/lib/etcd/etcd.etcd/etc' }}" +etcd_system_container_conf_dir: /var/lib/etcd/etc etcd_ca_file: "{{ etcd_conf_dir }}/ca.crt" etcd_cert_file: "{{ etcd_conf_dir }}/server.crt" etcd_key_file: "{{ etcd_conf_dir }}/server.key" |