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

This commit is contained in:
Zuul 2023-08-23 10:05:33 +00:00 committed by Gerrit Code Review
commit 0258141d37
3 changed files with 18 additions and 3 deletions

View File

@ -40,9 +40,8 @@
password: "{{ kolla_docker_registry_password }}"
reauthorize: yes
when:
# NOTE(wszumski): Switch to truthy filter when min ansible>=2.10.5
- kolla_docker_registry_username not in [none, ""]
- kolla_docker_registry_password not in [none, ""]
- kolla_docker_registry_username is truthy
- kolla_docker_registry_password is truthy
- name: Ensure Kolla container images are built
shell:

View File

@ -1,4 +1,14 @@
---
- 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)
include_tasks: deploy.yml
vars:

View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixed issue of seed containers being unable to use password
protected registry by adding docker login function to kayobe
deploy-containers role.