summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2017-09-22 11:42:01 -0400
committerAndrew Butcher <abutcher@redhat.com>2017-09-22 11:42:01 -0400
commitc44b334a8a788c46e9fe7e62edbef6f11d3c1a4b (patch)
treea364050295f0f7b383db051b159ecaf7d656ec6e
parent5b1bb00a2f02e51ab493e86eb4d8b6e264e3268d (diff)
downloadopenshift-c44b334a8a788c46e9fe7e62edbef6f11d3c1a4b.tar.gz
openshift-c44b334a8a788c46e9fe7e62edbef6f11d3c1a4b.tar.bz2
openshift-c44b334a8a788c46e9fe7e62edbef6f11d3c1a4b.tar.xz
openshift-c44b334a8a788c46e9fe7e62edbef6f11d3c1a4b.zip
Set master facts prior to adding new etcd client urls to master config.
-rw-r--r--playbooks/common/openshift-etcd/scaleup.yml20
1 files changed, 11 insertions, 9 deletions
diff --git a/playbooks/common/openshift-etcd/scaleup.yml b/playbooks/common/openshift-etcd/scaleup.yml
index d3fa48bad..4f83264d0 100644
--- a/playbooks/common/openshift-etcd/scaleup.yml
+++ b/playbooks/common/openshift-etcd/scaleup.yml
@@ -60,15 +60,17 @@
- name: Update master etcd client urls
hosts: oo_masters_to_config
serial: 1
- tasks:
+ vars:
+ 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_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 }}"
+ roles:
+ - role: openshift_master_facts
+ post_tasks:
- include_role:
name: openshift_master
tasks_from: update_etcd_client_urls
- vars:
- 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_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 }}"