diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-10-13 16:09:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-13 16:09:37 +0200 |
| commit | cddde04a8ec562b8df840ae7125bbb38249c215a (patch) | |
| tree | 7090515a2716f83df92776da394aca0b8aec9194 /playbooks | |
| parent | 12469e264fc10b17fb837b6c15e3c211a21aef3f (diff) | |
| parent | fe3c468220ba24b6b2afeab546be21f45bce6a01 (diff) | |
| download | openshift-cddde04a8ec562b8df840ae7125bbb38249c215a.tar.gz openshift-cddde04a8ec562b8df840ae7125bbb38249c215a.tar.bz2 openshift-cddde04a8ec562b8df840ae7125bbb38249c215a.tar.xz openshift-cddde04a8ec562b8df840ae7125bbb38249c215a.zip | |
Merge pull request #5735 from ingvagabund/default-oo_new_etcd_to_config-to-empty-list
Default groups.oo_new_etcd_to_config to an empty list
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-etcd/scaleup.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-etcd/scaleup.yml b/playbooks/common/openshift-etcd/scaleup.yml index b5ba2bbba..58848a81b 100644 --- a/playbooks/common/openshift-etcd/scaleup.yml +++ b/playbooks/common/openshift-etcd/scaleup.yml @@ -71,7 +71,7 @@ etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}" openshift_ca_host: "{{ groups.oo_first_master.0 }}" openshift_master_etcd_hosts: "{{ hostvars - | oo_select_keys(groups['oo_etcd_to_config'] | union(groups['oo_new_etcd_to_config'])) + | oo_select_keys(groups['oo_etcd_to_config'] | union(groups['oo_new_etcd_to_config'] | default([]) )) | oo_collect('openshift.common.hostname') | default(none, true) }}" openshift_master_etcd_port: "{{ (etcd_client_port | default('2379')) if (groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config) else none }}" |