From ed263eeb4f8e85c2b33d3f92f5f711f725f5fdae Mon Sep 17 00:00:00 2001
From: Rafal Lewandowski <rafal@stackhpc.com>
Date: Thu, 6 Jul 2023 13:08:49 +0200
Subject: [PATCH] Fix for seed-containers being unable to use password
 protected registry

Update old code to use truthy filter

Closes-bug: #2026276
Change-Id: I2085f9d1fd457e5b54b17f37a5e725990a60e8bc
---
 ansible/container-image-build.yml                      |  5 ++---
 ansible/roles/deploy-containers/tasks/main.yml         | 10 ++++++++++
 .../notes/kayobe_docker_login-495a424c2da479a7.yaml    |  6 ++++++
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/kayobe_docker_login-495a424c2da479a7.yaml

diff --git a/ansible/container-image-build.yml b/ansible/container-image-build.yml
index a790201b1..9a6674052 100644
--- a/ansible/container-image-build.yml
+++ b/ansible/container-image-build.yml
@@ -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:
diff --git a/ansible/roles/deploy-containers/tasks/main.yml b/ansible/roles/deploy-containers/tasks/main.yml
index 9d3e15209..c1ec533a3 100644
--- a/ansible/roles/deploy-containers/tasks/main.yml
+++ b/ansible/roles/deploy-containers/tasks/main.yml
@@ -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:
diff --git a/releasenotes/notes/kayobe_docker_login-495a424c2da479a7.yaml b/releasenotes/notes/kayobe_docker_login-495a424c2da479a7.yaml
new file mode 100644
index 000000000..d1c2e2bb5
--- /dev/null
+++ b/releasenotes/notes/kayobe_docker_login-495a424c2da479a7.yaml
@@ -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.