summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstaebler <staebler@redhat.com>2017-10-18 12:41:53 -0400
committerstaebler <staebler@redhat.com>2017-10-18 12:41:53 -0400
commit158d8d22776b4d12a0fbcfd4261ae17e41c4ebe5 (patch)
tree6a1da072200564ca2112c6c0f52c85755e86c76d
parent1c1be004b5089558c2a63b3a03150e397d8ac606 (diff)
downloadopenshift-158d8d22776b4d12a0fbcfd4261ae17e41c4ebe5.tar.gz
openshift-158d8d22776b4d12a0fbcfd4261ae17e41c4ebe5.tar.bz2
openshift-158d8d22776b4d12a0fbcfd4261ae17e41c4ebe5.tar.xz
openshift-158d8d22776b4d12a0fbcfd4261ae17e41c4ebe5.zip
Use service-signer.crt for ca_bundle passed to clusterservicebroker
-rw-r--r--roles/ansible_service_broker/tasks/install.yml6
-rw-r--r--roles/template_service_broker/tasks/main.yml2
2 files changed, 6 insertions, 2 deletions
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
diff --git a/roles/template_service_broker/tasks/main.yml b/roles/template_service_broker/tasks/main.yml
index d7ca970c7..6cb6a67f1 100644
--- a/roles/template_service_broker/tasks/main.yml
+++ b/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