diff options
| author | Fabian von Feilitzsch <fabian@fabianism.us> | 2017-11-06 11:48:41 -0500 |
|---|---|---|
| committer | Fabian von Feilitzsch <fabian@fabianism.us> | 2017-11-06 11:48:41 -0500 |
| commit | b27f719acfc00e6891799cec5979c7d0c503301c (patch) | |
| tree | 308172e26d50f9c13777d402fe489736e09a4726 /roles/ansible_service_broker/tasks/validate_facts.yml | |
| parent | 5efcf4a2f7e9c2f21c6f9f86dc08f12fd5f56290 (diff) | |
| download | openshift-b27f719acfc00e6891799cec5979c7d0c503301c.tar.gz openshift-b27f719acfc00e6891799cec5979c7d0c503301c.tar.bz2 openshift-b27f719acfc00e6891799cec5979c7d0c503301c.tar.xz openshift-b27f719acfc00e6891799cec5979c7d0c503301c.zip | |
Bug 1509680- Fix ansible-service-broker registry validations
- Remove outdated dockerhub registry validations
- Add the local openshift registry by default
- Add whitelist parameter for local registry
- Set default dockerhub org to ansibleplaybookbundle
Diffstat (limited to 'roles/ansible_service_broker/tasks/validate_facts.yml')
| -rw-r--r-- | roles/ansible_service_broker/tasks/validate_facts.yml | 6 |
1 files changed, 2 insertions, 4 deletions
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 |