diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-23 16:11:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-23 16:11:30 -0700 |
| commit | 5632b266c6d44f371fe7d36a0e367c462cf7a701 (patch) | |
| tree | 772b3400c0370189acf09d9155e78d4f65a6f06d | |
| parent | a4448918cd816cd06f0ae65aea9c912632731d52 (diff) | |
| parent | c44b334a8a788c46e9fe7e62edbef6f11d3c1a4b (diff) | |
| download | openshift-5632b266c6d44f371fe7d36a0e367c462cf7a701.tar.gz openshift-5632b266c6d44f371fe7d36a0e367c462cf7a701.tar.bz2 openshift-5632b266c6d44f371fe7d36a0e367c462cf7a701.tar.xz openshift-5632b266c6d44f371fe7d36a0e367c462cf7a701.zip | |
Merge pull request #5507 from abutcher/etcd-scaleup-urls
Automatic merge from submit-queue
Set master facts prior to adding new etcd client urls to master config.
`openshift_master` role dependencies were moved out of the role in https://github.com/openshift/openshift-ansible/pull/5392 so we need to call `openshift_master_facts` prior to patching the master config in etcd scaleup.
https://bugzilla.redhat.com/show_bug.cgi?id=1490304
| -rw-r--r-- | playbooks/common/openshift-etcd/scaleup.yml | 20 |
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 }}" |