diff options
author | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-12 16:07:34 +0200 |
---|---|---|
committer | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-18 12:33:16 +0200 |
commit | 4fcbe72aeaf359d56ac636a8722f817ec10c629f (patch) | |
tree | 93436888a90064b447d60cfa7f365100b81af823 /roles/etcd_common/defaults | |
parent | f186712088f8e14d7f90a010d0f2cb250e24ee42 (diff) | |
download | openshift-4fcbe72aeaf359d56ac636a8722f817ec10c629f.tar.gz openshift-4fcbe72aeaf359d56ac636a8722f817ec10c629f.tar.bz2 openshift-4fcbe72aeaf359d56ac636a8722f817ec10c629f.tar.xz openshift-4fcbe72aeaf359d56ac636a8722f817ec10c629f.zip |
move etcd upgrade related code into etcd_upgrade role
Diffstat (limited to 'roles/etcd_common/defaults')
-rw-r--r-- | roles/etcd_common/defaults/main.yml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/roles/etcd_common/defaults/main.yml b/roles/etcd_common/defaults/main.yml index d12e6a07f..e1a080b34 100644 --- a/roles/etcd_common/defaults/main.yml +++ b/roles/etcd_common/defaults/main.yml @@ -1,6 +1,9 @@ --- +# runc, docker, host +r_etcd_common_etcd_runtime: "docker" + # etcd server vars -etcd_conf_dir: "{{ '/etc/etcd' if not openshift.common.is_etcd_system_container else '/var/lib/etcd/etcd.etcd/etc' }}" +etcd_conf_dir: "{{ '/etc/etcd' if r_etcd_common_etcd_runtime != 'runc' else '/var/lib/etcd/etcd.etcd/etc' }}" etcd_system_container_conf_dir: /var/lib/etcd/etc etcd_conf_file: "{{ etcd_conf_dir }}/etcd.conf" etcd_ca_file: "{{ etcd_conf_dir }}/ca.crt" @@ -38,3 +41,9 @@ etcd_is_thirdparty: False # etcd dir vars etcd_data_dir: /var/lib/etcd/ + +# etcd ports and protocols +etcd_client_port: 2379 +etcd_peer_port: 2380 +etcd_url_scheme: http +etcd_peer_url_scheme: http |