diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-21 18:44:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-21 18:44:31 +0200 |
| commit | 4cd57c9d9f2ed4838f7dceed36cd48b418b5f2f3 (patch) | |
| tree | 9d52993b1625ed02ad7590e381b1313cebaa5d82 /roles/etcd_common/defaults | |
| parent | 22dfad7ae3492cf949871981e3a84bcefbd138f0 (diff) | |
| parent | 4fcbe72aeaf359d56ac636a8722f817ec10c629f (diff) | |
| download | openshift-4cd57c9d9f2ed4838f7dceed36cd48b418b5f2f3.tar.gz openshift-4cd57c9d9f2ed4838f7dceed36cd48b418b5f2f3.tar.bz2 openshift-4cd57c9d9f2ed4838f7dceed36cd48b418b5f2f3.tar.xz openshift-4cd57c9d9f2ed4838f7dceed36cd48b418b5f2f3.zip | |
Merge pull request #4217 from ingvagabund/move-etcd-upgrade-code-into-role
Move etcd upgrade code into 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 |