diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-11-06 16:20:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-06 16:20:40 -0500 |
| commit | b1c349dfd774199125033d76a31a90daa09a8a9c (patch) | |
| tree | 52a1551c4541a7ee9121529be343c1ffc775b0f2 | |
| parent | 27cd7ecd76ba5e6a616fc50eb401f965b4c90207 (diff) | |
| parent | b27f719acfc00e6891799cec5979c7d0c503301c (diff) | |
| download | openshift-b1c349dfd774199125033d76a31a90daa09a8a9c.tar.gz openshift-b1c349dfd774199125033d76a31a90daa09a8a9c.tar.bz2 openshift-b1c349dfd774199125033d76a31a90daa09a8a9c.tar.xz openshift-b1c349dfd774199125033d76a31a90daa09a8a9c.zip | |
Merge pull request #6026 from fabianvf/1509680-asb-credential-check
Bug 1509680- Fix ansible-service-broker registry settings/validations
4 files changed, 7 insertions, 5 deletions
diff --git a/roles/ansible_service_broker/defaults/main.yml b/roles/ansible_service_broker/defaults/main.yml index dc05b03b5..34110ca99 100644 --- a/roles/ansible_service_broker/defaults/main.yml +++ b/roles/ansible_service_broker/defaults/main.yml @@ -14,3 +14,4 @@ ansible_service_broker_launch_apb_on_bind: false ansible_service_broker_image_pull_policy: IfNotPresent ansible_service_broker_sandbox_role: edit ansible_service_broker_auto_escalate: false +ansible_service_broker_local_registry_whitelist: [] diff --git a/roles/ansible_service_broker/tasks/install.yml b/roles/ansible_service_broker/tasks/install.yml index 808c24bbd..3ee88bcd7 100644 --- a/roles/ansible_service_broker/tasks/install.yml +++ b/roles/ansible_service_broker/tasks/install.yml @@ -312,6 +312,9 @@ org: {{ ansible_service_broker_registry_organization }} tag: {{ ansible_service_broker_registry_tag }} white_list: {{ ansible_service_broker_registry_whitelist }} + - type: local_registry + namespaces: ['openshift'] + white_list: {{ ansible_service_broker_local_registry_whitelist }} dao: etcd_host: 0.0.0.0 etcd_port: 2379 diff --git a/roles/ansible_service_broker/tasks/validate_facts.yml b/roles/ansible_service_broker/tasks/validate_facts.yml index 604d24e1d..a2345551b 100644 --- a/roles/ansible_service_broker/tasks/validate_facts.yml +++ b/roles/ansible_service_broker/tasks/validate_facts.yml @@ -1,11 +1,9 @@ --- - name: validate Dockerhub registry settings - fail: msg="To use the dockerhub registry, you must provide the ansible_service_broker_registry_user. ansible_service_broker_registry_password, and ansible_service_broker_registry_organization parameters" + fail: msg="To use the dockerhub registry, you must provide the ansible_service_broker_registry_organization" when: - ansible_service_broker_registry_type == 'dockerhub' - - not (ansible_service_broker_registry_user and - ansible_service_broker_registry_password and - ansible_service_broker_registry_organization) + - not ansible_service_broker_registry_organization - name: validate RHCC registry settings diff --git a/roles/ansible_service_broker/vars/default_images.yml b/roles/ansible_service_broker/vars/default_images.yml index 8438e993f..248e0363d 100644 --- a/roles/ansible_service_broker/vars/default_images.yml +++ b/roles/ansible_service_broker/vars/default_images.yml @@ -12,6 +12,6 @@ __ansible_service_broker_registry_name: dh __ansible_service_broker_registry_url: null __ansible_service_broker_registry_user: null __ansible_service_broker_registry_password: null -__ansible_service_broker_registry_organization: null +__ansible_service_broker_registry_organization: ansibleplaybookbundle __ansible_service_broker_registry_tag: latest __ansible_service_broker_registry_whitelist: [] |