summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstaebler <staebler@redhat.com>2017-10-18 13:30:07 -0400
committerstaebler <staebler@redhat.com>2017-10-18 13:32:55 -0400
commitdc89e0fa2b3e5fa10027e93a1124ed6eeacad021 (patch)
tree9c76a3669986c01bbd8da3093f989f5179bcd20b
parent158d8d22776b4d12a0fbcfd4261ae17e41c4ebe5 (diff)
downloadopenshift-dc89e0fa2b3e5fa10027e93a1124ed6eeacad021.tar.gz
openshift-dc89e0fa2b3e5fa10027e93a1124ed6eeacad021.tar.bz2
openshift-dc89e0fa2b3e5fa10027e93a1124ed6eeacad021.tar.xz
openshift-dc89e0fa2b3e5fa10027e93a1124ed6eeacad021.zip
Change to service-signer.crt for template_service_broker CA_BUNDLE
-rw-r--r--roles/template_service_broker/tasks/install.yml4
-rw-r--r--roles/template_service_broker/tasks/main.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/template_service_broker/tasks/install.yml b/roles/template_service_broker/tasks/install.yml
index f5fd6487c..124b91b73 100644
--- a/roles/template_service_broker/tasks/install.yml
+++ b/roles/template_service_broker/tasks/install.yml
@@ -6,7 +6,7 @@
- "{{ openshift_deployment_type | default(deployment_type) }}.yml"
- "default_images.yml"
-- name: set ansible_service_broker facts
+- name: set template_service_broker facts
set_fact:
template_service_broker_prefix: "{{ template_service_broker_prefix | default(__template_service_broker_prefix) }}"
template_service_broker_version: "{{ template_service_broker_version | default(__template_service_broker_version) }}"
@@ -62,7 +62,7 @@
when: openshift_master_config_dir is undefined
- slurp:
- src: "{{ openshift_master_config_dir }}/ca.crt"
+ src: "{{ openshift_master_config_dir }}/service-signer.crt"
register: __ca_bundle
# Register with broker
diff --git a/roles/template_service_broker/tasks/main.yml b/roles/template_service_broker/tasks/main.yml
index 6cb6a67f1..d7ca970c7 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: not template_service_broker_remove | default(false) | bool
+ when: template_service_broker_install | default(false) | bool
- include: remove.yml
when: template_service_broker_remove | default(false) | bool