summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-04 11:28:10 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-04 11:28:10 -0500
commit9ceee5dfeb5a7acfdb1e6b427e288596c4e4f64a (patch)
treea55287a31398cd2edaaa0c8f0a9f5a33e79d309d /playbooks
parentc792e1d19863e063a9544967f5b892030791bbd1 (diff)
parent3a8b4f1315e28f35e16ace77560f040f08588722 (diff)
downloadopenshift-9ceee5dfeb5a7acfdb1e6b427e288596c4e4f64a.tar.gz
openshift-9ceee5dfeb5a7acfdb1e6b427e288596c4e4f64a.tar.bz2
openshift-9ceee5dfeb5a7acfdb1e6b427e288596c4e4f64a.tar.xz
openshift-9ceee5dfeb5a7acfdb1e6b427e288596c4e4f64a.zip
Merge pull request #767 from abutcher/custom-certs
Add custom certificates to serving info in master configuration.
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-master/config.yml9
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 }}"