Merge pull request #157 from stackhpc/upstream/yoga-2023-08-29

Synchronise yoga with upstream

ansible/container-image-build.yml

@@ -41,9 +41,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:

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:

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.

roles/kayobe-diagnostics/files/get_logs.sh

@@ -65,6 +65,10 @@ copy_logs() {
         cp -r /etc/apt/sources.list.d/ ${LOG_DIR}/system_logs/
     fi
 
+    if [[ -d /etc/systemd/ ]]; then
+        cp -rL /etc/systemd/ ${LOG_DIR}/system_logs/
+    fi
+
     df -h > ${LOG_DIR}/system_logs/df.txt
     # Gather disk usage statistics for files and directories larger than 1MB
     du -d 5 -hx / | sort -hr | grep '^[0-9\.]*[MGT]' > ${LOG_DIR}/system_logs/du.txt