Browse Source

Merge pull request #9485 from dymurray/namespaces

Bug 1543129 - Add configuration option for ASB local registry namespaces
Scott Dodson 6 years ago
parent
commit
728b2be34c

+ 1 - 0
roles/ansible_service_broker/defaults/main.yml

@@ -21,6 +21,7 @@ ansible_service_broker_image_pull_policy: Always
 ansible_service_broker_sandbox_role: edit
 ansible_service_broker_auto_escalate: false
 ansible_service_broker_local_registry_whitelist: []
+ansible_service_broker_local_registry_namespaces: ["openshift"]
 
 l_asb_default_images_dict:
   origin: 'docker.io/ansibleplaybookbundle/origin-ansible-service-broker:latest'

+ 1 - 1
roles/ansible_service_broker/templates/configmap.yaml.j2

@@ -19,8 +19,8 @@ data:
         auth_name: "{{ ansible_service_broker_registry_auth_name | default("") }}"
       - type: local_openshift
         name: localregistry
-        namespaces: ['openshift']
         white_list: {{ ansible_service_broker_local_registry_whitelist | to_yaml }}
+        namespaces: {{ ansible_service_broker_local_registry_namespaces | to_yaml }}
     dao:
       type: crd
     log: