Merge pull request #9682 from djzager/broker-apb

Bug 1615787 - Blacklist broker-apb

roles/ansible_service_broker/tasks/facts.yml

@@ -16,5 +16,6 @@
     ansible_service_broker_registry_organization: "{{ ansible_service_broker_registry_organization | default(__ansible_service_broker_registry_organization) }}"
     ansible_service_broker_registry_tag: "{{ ansible_service_broker_registry_tag | default(__ansible_service_broker_registry_tag) }}"
     ansible_service_broker_registry_whitelist: "{{ ansible_service_broker_registry_whitelist | default(__ansible_service_broker_registry_whitelist) }}"
+    ansible_service_broker_registry_blacklist: "{{ ansible_service_broker_registry_blacklist | default(__ansible_service_broker_registry_blacklist) }}"
 
 - include_tasks: validate_facts.yml

roles/ansible_service_broker/templates/configmap.yaml.j2

@@ -15,6 +15,7 @@ data:
         org:  {{ ansible_service_broker_registry_organization }}
         tag:  {{ ansible_service_broker_registry_tag }}
         white_list: {{  ansible_service_broker_registry_whitelist | to_yaml }}
+        black_list: {{  ansible_service_broker_registry_blacklist | to_yaml }}
         auth_type: "{{ ansible_service_broker_registry_auth_type | default("") }}"
         auth_name: "{{ ansible_service_broker_registry_auth_name | default("") }}"
       - type: local_openshift

roles/ansible_service_broker/vars/default_images.yml

@@ -7,3 +7,5 @@ __ansible_service_broker_registry_password: null
 __ansible_service_broker_registry_organization: ansibleplaybookbundle
 __ansible_service_broker_registry_tag: latest
 __ansible_service_broker_registry_whitelist: []
+__ansible_service_broker_registry_blacklist:
+  - '.*automation-broker-apb$'

roles/ansible_service_broker/vars/openshift-enterprise.yml

@@ -8,3 +8,5 @@ __ansible_service_broker_registry_organization: null
 __ansible_service_broker_registry_tag: "{{ openshift_image_tag }}"
 __ansible_service_broker_registry_whitelist:
   - '.*-apb$'
+__ansible_service_broker_registry_blacklist:
+  - '.*automation-broker-apb$'