Use service-signer.crt for ca_bundle passed to clusterservicebroker

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
 
 

roles/template_service_broker/tasks/main.yml

@@ -2,7 +2,7 @@
 # do any asserts here
 
 - include: install.yml
-  when: template_service_broker_install | default(false) | bool
+  when: not template_service_broker_remove | default(false) | bool
 
 - include: remove.yml
   when: template_service_broker_remove | default(false) | bool