Fix for seed-containers being unable to use password protected registry
Update old code to use truthy filter Closes-bug: #2026276 Change-Id: I2085f9d1fd457e5b54b17f37a5e725990a60e8bc
This commit is contained in:
parent
e87a744734
commit
ed263eeb4f
@ -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:
|
||||||
|
@ -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)
|
- name: Deploy containers (loop)
|
||||||
include_tasks: deploy.yml
|
include_tasks: deploy.yml
|
||||||
vars:
|
vars:
|
||||||
|
@ -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.
|
Loading…
x
Reference in New Issue
Block a user