Skip to content
Snippets Groups Projects
Commit 0258141d authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "Fix for seed-containers being unable to use password protected registry"

parents d52b764a ed263eeb
No related branches found
No related tags found
No related merge requests found
...@@ -40,9 +40,8 @@ ...@@ -40,9 +40,8 @@
password: "{{ kolla_docker_registry_password }}" password: "{{ kolla_docker_registry_password }}"
reauthorize: yes reauthorize: yes
when: when:
# NOTE(wszumski): Switch to truthy filter when min ansible>=2.10.5 - kolla_docker_registry_username is truthy
- kolla_docker_registry_username not in [none, ""] - kolla_docker_registry_password is truthy
- kolla_docker_registry_password not in [none, ""]
- name: Ensure Kolla container images are built - name: Ensure Kolla container images are built
shell: shell:
......
--- ---
- name: Login to docker registry
docker_login:
registry_url: "{{ kolla_docker_registry or omit }}"
username: "{{ kolla_docker_registry_username }}"
password: "{{ kolla_docker_registry_password }}"
reauthorize: yes
when:
- kolla_docker_registry_username is truthy
- kolla_docker_registry_password is truthy
- name: Deploy containers (loop) - name: Deploy containers (loop)
include_tasks: deploy.yml include_tasks: deploy.yml
vars: vars:
......
---
fixes:
- |
Fixed issue of seed containers being unable to use password
protected registry by adding docker login function to kayobe
deploy-containers role.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment