summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2015-10-28 10:39:41 -0400
committerAndrew Butcher <abutcher@redhat.com>2015-11-03 11:24:13 -0500
commit8da7c1f5bc68110469bedceb0ddad4fdfc8b7e4d (patch)
treed138e6ddb5cca91d9aa14504e28c5f2f7205882d /playbooks
parent769a2e15cb505c53aab5953735566e6657dd17c3 (diff)
downloadopenshift-8da7c1f5bc68110469bedceb0ddad4fdfc8b7e4d.tar.gz
openshift-8da7c1f5bc68110469bedceb0ddad4fdfc8b7e4d.tar.bz2
openshift-8da7c1f5bc68110469bedceb0ddad4fdfc8b7e4d.tar.xz
openshift-8da7c1f5bc68110469bedceb0ddad4fdfc8b7e4d.zip
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..4662c179a 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) }}"
+ 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 }}"