diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-04 15:05:06 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-04 15:05:06 -0400 |
| commit | 153c57d6bda48276bc1f8be520145780fa119941 (patch) | |
| tree | 7bcd0ddd715a688e9695bd65c642a89e1cda2687 /playbooks/common/openshift-master | |
| parent | 215a7aacc2fc3df19a64a2a57910516533665423 (diff) | |
| parent | 896b9c63292a50dce8e7aa00a889dfd52a3a8474 (diff) | |
| download | openshift-153c57d6bda48276bc1f8be520145780fa119941.tar.gz openshift-153c57d6bda48276bc1f8be520145780fa119941.tar.bz2 openshift-153c57d6bda48276bc1f8be520145780fa119941.tar.xz openshift-153c57d6bda48276bc1f8be520145780fa119941.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade
Diffstat (limited to 'playbooks/common/openshift-master')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 1dec923fc..59c4b2370 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -199,9 +199,18 @@ validate_checksum: yes with_items: masters_needing_certs +- name: Inspect named certificates + hosts: oo_first_master + tasks: + - name: Collect certificate names + set_fact: + parsed_named_certificates: "{{ openshift_master_named_certificates | oo_parse_certificate_names(master_cert_config_dir, openshift.common.internal_hostnames) }}" + when: openshift_master_named_certificates is defined + - name: Configure master instances hosts: oo_masters_to_config vars: + named_certificates: "{{ hostvars[groups['oo_first_master'][0]]['parsed_named_certificates'] | default([])}}" sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}" openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}" embedded_etcd: "{{ openshift.master.embedded_etcd }}" |