From 6e7ccabeaf3e6929b7b561b8aa6a1bb11a4364ec Mon Sep 17 00:00:00 2001
From: staebler <staebler@redhat.com>
Date: Tue, 17 Oct 2017 00:34:53 -0400
Subject: Remove redundant faulty role binding ifrom
kubeservicecatalog_roles_bindings.yml
---
roles/ansible_service_broker/tasks/install.yml | 2 +-
1 file changed, 1 insertion(+), 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 0f4b71124..aa8236fe0 100644
--- a/roles/ansible_service_broker/tasks/install.yml
+++ b/roles/ansible_service_broker/tasks/install.yml
@@ -331,7 +331,7 @@
content:
path: /tmp/brokerout
data:
- apiVersion: servicecatalog.k8s.io/v1alpha1
+ apiVersion: servicecatalog.k8s.io/v1beta1
kind: ServiceBroker
metadata:
name: ansible-service-broker
--
cgit v1.2.3
From 1c1be004b5089558c2a63b3a03150e397d8ac606 Mon Sep 17 00:00:00 2001
From: staebler <staebler@redhat.com>
Date: Tue, 17 Oct 2017 10:29:14 -0400
Subject: Rename ServiceBroker to ClusterServiceBroker for
ansible_service_broker task.
---
roles/ansible_service_broker/tasks/install.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(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 aa8236fe0..ee8ae49ef 100644
--- a/roles/ansible_service_broker/tasks/install.yml
+++ b/roles/ansible_service_broker/tasks/install.yml
@@ -327,12 +327,12 @@
oc_obj:
name: ansible-service-broker
state: present
- kind: ServiceBroker
+ kind: ClusterServiceBroker
content:
path: /tmp/brokerout
data:
apiVersion: servicecatalog.k8s.io/v1beta1
- kind: ServiceBroker
+ kind: ClusterServiceBroker
metadata:
name: ansible-service-broker
spec:
--
cgit v1.2.3
From 158d8d22776b4d12a0fbcfd4261ae17e41c4ebe5 Mon Sep 17 00:00:00 2001
From: staebler <staebler@redhat.com>
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.3