summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2017-09-11 15:56:46 -0400
committerAndrew Butcher <abutcher@redhat.com>2017-09-12 16:12:55 -0400
commit833c18bf8efa3c0988975138f1b7ddb95cd25f12 (patch)
treee2abd47bc522f0c8bf3c9cc5e297d961d3fa4986 /playbooks
parent7f6b76563c9fe6a96ea864c2dfea092e1f4805bc (diff)
downloadopenshift-833c18bf8efa3c0988975138f1b7ddb95cd25f12.tar.gz
openshift-833c18bf8efa3c0988975138f1b7ddb95cd25f12.tar.bz2
openshift-833c18bf8efa3c0988975138f1b7ddb95cd25f12.tar.xz
openshift-833c18bf8efa3c0988975138f1b7ddb95cd25f12.zip
Update master config with new client urls during etcd scaleup.
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-etcd/scaleup.yml19
1 files changed, 19 insertions, 0 deletions
diff --git a/playbooks/common/openshift-etcd/scaleup.yml b/playbooks/common/openshift-etcd/scaleup.yml
index 5f8bb1c7a..d3fa48bad 100644
--- a/playbooks/common/openshift-etcd/scaleup.yml
+++ b/playbooks/common/openshift-etcd/scaleup.yml
@@ -23,6 +23,9 @@
-C {{ etcd_peer_url_scheme }}://{{ hostvars[etcd_ca_host].etcd_hostname }}:{{ etcd_client_port }}
member add {{ etcd_hostname }} {{ etcd_peer_url_scheme }}://{{ etcd_ip }}:{{ etcd_peer_port }}
delegate_to: "{{ etcd_ca_host }}"
+ failed_when:
+ - etcd_add_check.rc == 1
+ - ("peerURL exists" not in etcd_add_check.stderr)
register: etcd_add_check
retries: 3
delay: 10
@@ -53,3 +56,19 @@
retries: 3
delay: 30
until: scaleup_health.rc == 0
+
+- name: Update master etcd client urls
+ hosts: oo_masters_to_config
+ serial: 1
+ 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 }}"