From 158d8d22776b4d12a0fbcfd4261ae17e41c4ebe5 Mon Sep 17 00:00:00 2001 From: staebler Date: Wed, 18 Oct 2017 12:41:53 -0400 Subject: Use service-signer.crt for ca_bundle passed to clusterservicebroker --- roles/ansible_service_broker/tasks/install.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'roles/ansible_service_broker') diff --git a/roles/ansible_service_broker/tasks/install.yml b/roles/ansible_service_broker/tasks/install.yml index ee8ae49ef..c0384b7c4 100644 --- a/roles/ansible_service_broker/tasks/install.yml +++ b/roles/ansible_service_broker/tasks/install.yml @@ -30,8 +30,12 @@ ansible_service_broker_image: "{{ ansible_service_broker_image_prefix }}ansible-service-broker:{{ ansible_service_broker_image_tag }}" ansible_service_broker_etcd_image: "{{ ansible_service_broker_etcd_image_prefix }}etcd:{{ ansible_service_broker_etcd_image_tag }}" +- set_fact: + openshift_master_config_dir: "{{ openshift.common.config_base }}/master" + when: openshift_master_config_dir is undefined + - slurp: - src: "{{ ansible_service_broker_certs_dir }}/ca.crt" + src: "{{ openshift_master_config_dir }}/service-signer.crt" register: catalog_ca -- cgit v1.2.1