gistfile1.diff

diff --git a/ansible_role/defaults/main.yml b/ansible_role/defaults/main.yml
index 730fa144a..23bd6518b 100644
--- a/ansible_role/defaults/main.yml
+++ b/ansible_role/defaults/main.yml
@@ -9,8 +9,12 @@ cluster: "kubernetes"
 olm_managed: false
 
 # Broker configuration values
-broker_name: automation-broker
+broker_name: openshift-ansible-service-broker
 broker_namespace: "{{ namespace | default(broker_name, true) }}"
+broker_clusterservicebroker_name: ansible-service-broker
+broker_dc_name: asb
+broker_route_name: asb
+broker_service_name: "{{ broker_route_name }}"
 
 create_broker_namespace: false
 wait_for_broker: false # By default, we do not wait for the broker to be available
diff --git a/ansible_role/templates/broker-redirector.route.yaml b/ansible_role/templates/broker-redirector.route.yaml
index b07243e2d..0126bc088 100644
--- a/ansible_role/templates/broker-redirector.route.yaml
+++ b/ansible_role/templates/broker-redirector.route.yaml
@@ -7,10 +7,10 @@ metadata:
   namespace: {{ broker_namespace }}
   labels:
     app: {{ broker_name }}
-    service: broker
+    service: {{ broker_service_name }}
 spec:
   to:
     kind: Service
-    name: broker
+    name: {{ broker_service_name }}
   port:
     targetPort: port-1337
diff --git a/ansible_role/templates/broker.deployment.yaml b/ansible_role/templates/broker.deployment.yaml
index e92b6bdd6..d945ff566 100644
--- a/ansible_role/templates/broker.deployment.yaml
+++ b/ansible_role/templates/broker.deployment.yaml
@@ -8,7 +8,7 @@ apiVersion: apps/v1
 kind: Deployment
 {% endif %}
 metadata:
-  name: {{ broker_name }}
+  name: {{ broker_dc_name }}
   namespace: {{ broker_namespace }}
   labels:
     app: {{ broker_name }}
diff --git a/ansible_role/templates/broker.route.yaml b/ansible_role/templates/broker.route.yaml
index f31d6e0b8..6c839a45d 100644
--- a/ansible_role/templates/broker.route.yaml
+++ b/ansible_role/templates/broker.route.yaml
@@ -5,15 +5,15 @@ kind: Route
 metadata:
   annotations:
     haproxy.router.openshift.io/timeout: 300s
-  name: broker
+  name: {{ broker_route_name }}
   namespace: {{ broker_namespace }}
   labels:
     app: {{ broker_name }}
-    service: broker
+    service: {{ broker_service_name }}
 spec:
   to:
     kind: Service
-    name: broker
+    name: {{ broker_service_name }}
   port:
     targetPort: port-1338
   tls:
diff --git a/ansible_role/templates/broker.service.yaml b/ansible_role/templates/broker.service.yaml
index d3178d0d4..d6805117d 100644
--- a/ansible_role/templates/broker.service.yaml
+++ b/ansible_role/templates/broker.service.yaml
@@ -3,11 +3,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: broker
+  name: {{ broker_service_name }}
   namespace: {{ broker_namespace }}
   labels:
     app: {{ broker_name }}
-    service: broker
+    service: {{ broker_service_name }}
 {% if 'route.openshift.io' in lookup('k8s', cluster_info='api_groups') %}
   annotations:
     service.alpha.openshift.io/serving-cert-secret-name: {{ broker_tls_name }}
@@ -24,4 +24,4 @@ spec:
       protocol: TCP
   selector:
     app: {{ broker_name }}
-    service: broker
+    service: {{ broker_service_name }}
diff --git a/ansible_role/templates/broker.servicecatalog.yaml b/ansible_role/templates/broker.servicecatalog.yaml
index 1e6e06333..f741daf6b 100644
--- a/ansible_role/templates/broker.servicecatalog.yaml
+++ b/ansible_role/templates/broker.servicecatalog.yaml
@@ -3,13 +3,13 @@
 apiVersion: servicecatalog.k8s.io/v1beta1
 kind: {{ broker_kind }}
 metadata:
-  name: {{ broker_name }}
+  name: {{ broker_clusterservicebroker_name }}
 {% if broker_kind == 'ServiceBroker' %}
   namespace: {{ broker_namespace }}
 {% endif %}
 {% if state == 'present' %}
 spec:
-  url: https://broker.{{ broker_namespace }}.svc:1338/osb/
+  url: https://{{ broker_service_name }}.{{ broker_namespace }}.svc:1338/osb/
   authInfo:
     bearer:
       secretRef: