Fully qualify seed container images (#2202)

Use Kayobe action_plugins to direct calls to the correct
container_engine.

Seed hosts configured to use the Podman container
engine do not automatically resolve image short-names
to docker.io like seed hosts using the Docker
container engine.

Fully qualify seed container images so that Podman
does not fail to resolve them out of the box.

Author: m-bull

etc/kayobe/ansible/fixes/hotfix-containers.yml

@@ -24,7 +24,7 @@
         - container_hotfix_container_regex == "" or container_hotfix_command == "" and container_hotfix_files == []
 
     - name: Get list of containers to hotfix
-      ansible.builtin.command: '{{ kolla_container_engine | default("docker") }} ps --format {% raw %}"{{ .Names }}"{% endraw %}'
+      ansible.builtin.command: '{{ container_engine | default("docker") }} ps --format {% raw %}"{{ .Names }}"{% endraw %}'
       register: host_containers
 
     - name: Set fact for containers list
@@ -64,6 +64,6 @@
         state: absent
 
     - name: Restart containers if requested
-      ansible.builtin.command: "{{ kolla_container_engine | default('docker') }} restart {{ item }}"
+      ansible.builtin.command: "{{ container_engine | default('docker') }} restart {{ item }}"
       loop: "{{ containers_list | regex_findall(container_hotfix_container_regex, multiline=True) | list | unique }}"
       when: container_hotfix_restart_containers

etc/kayobe/ansible/fixes/run-container-hotfix.yml

@@ -3,23 +3,23 @@
   when: container_hotfix_files != []
   block:
     - name: Ensure any required directories exist in container(s)
-      ansible.builtin.command: "{{ kolla_container_engine | default('docker') }} exec {{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} mkdir
+      ansible.builtin.command: "{{ container_engine | default('docker') }} exec {{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} mkdir
         -p {{ item.dest | dirname }}"
       loop: "{{ container_hotfix_files }}"
 
     - name: Copy file into container(s)
-      ansible.builtin.command: "{{ kolla_container_engine | default('docker') }} cp /tmp/hotfix-files/{{ index }} {{ hotfix_container }}:{{ item.dest }}"
+      ansible.builtin.command: "{{ container_engine | default('docker') }} cp /tmp/hotfix-files/{{ index }} {{ hotfix_container }}:{{ item.dest }}"
       loop: "{{ container_hotfix_files }}"
       loop_control:
         index_var: index
 
     - name: Set mode for copied files
-      ansible.builtin.command: "{{ kolla_container_engine | default('docker') }} exec {{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} chmod
+      ansible.builtin.command: "{{ container_engine | default('docker') }} exec {{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} chmod
         {{ item.mode | default('400') }} {{ item.dest }}"
       loop: "{{ container_hotfix_files }}"
       loop_control:
         index_var: index
 
 - name: Run container_hotfix_command
-  ansible.builtin.command: "{{ kolla_container_engine | default('docker') }} exec {{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} {{ container_hotfix_command }}"
+  ansible.builtin.command: "{{ container_engine | default('docker') }} exec {{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} {{ container_hotfix_command }}"
   when: container_hotfix_command

etc/kayobe/containers/pulp/post.yml

@@ -10,7 +10,7 @@
 - name: Set the Pulp admin password
   become: true
   command: >-
-    docker exec -u root pulp
+    {{ container_engine | default("docker") }} exec -u root pulp
     bash -c
       "pulpcore-manager reset-admin-password -p \"{{ pulp_password }}\""
   no_log: true
@@ -21,7 +21,7 @@
 - name: Manage Pulp content checksums
   become: true
   command: >-
-    docker exec -u root pulp
+    {{ container_engine | default("docker") }} exec -u root pulp
     bash -c
       'pulpcore-manager handle-artifact-checksums'
   when:
@@ -31,7 +31,7 @@
 - name: Manage Pulp content image data
   become: true
   command: >-
-    docker exec -u root pulp
+    {{ container_engine | default("docker") }} exec -u root pulp
     bash -c
       'pulpcore-manager container-handle-image-data'
 
@@ -48,7 +48,7 @@
     - pulp_stack_password is defined and pulp_stack_password | length > 0
 
 - name: Login to docker registry
-  docker_login:
+  kayobe_container_login:
     registry_url: "{{ kolla_docker_registry or omit }}"
     username: "{{ kolla_docker_registry_username }}"
     password: "{{ kolla_docker_registry_password }}"

etc/kayobe/containers/pulp/pre.yml

@@ -6,7 +6,7 @@
   become: true
 
 - name: Ensure required Docker volumes exist
-  docker_volume:
+  kayobe_container_volume:
     name: "{{ item }}"
   loop:
     - pulp_containers

etc/kayobe/containers/redfish_exporter/post.yml

@@ -1,6 +1,7 @@
 ---
 - name: Restart redfish exporter container if config changed
   become: true
-  command: docker kill -s SIGHUP redfish_exporter
+  command: >-
+    {{ container_engine | default("docker") }} kill -s SIGHUP redfish_exporter
   when:
     - redfish_exporter_config is changed

etc/kayobe/seed.yml

@@ -102,7 +102,7 @@ seed_pulp_container_enabled: true
 
 seed_pulp_container:
   pulp:
-    image: pulp/pulp
+    image: quay.io/pulp/pulp
     pre: "{{ kayobe_config_path }}/containers/pulp/pre.yml"
     post: "{{ kayobe_config_path }}/containers/pulp/post.yml"
     tag: "3.81.0"
@@ -127,7 +127,7 @@ seed_squid_container_enabled: false
 
 seed_squid_container:
   squid:
-    image: stackhpc/squid
+    image: docker.io/stackhpc/squid
     pre: "{{ kayobe_config_path }}/containers/squid_proxy/pre.yml"
     tag: "4.15"
     network_mode: host

releasenotes/notes/seed-container-image-locations-3b83bb42f6c50bab.yaml

@@ -0,0 +1,13 @@
+---
+fixes:
+  - |
+    Ensure that seed hosts using Podman pull seed container
+    images using their fully-qualified name, rather than
+    their short-name.
+  - |
+    Ensure that the ``container_engine variable`` is respected
+    when running ``pre.yaml`` and ``post.yaml`` for seed
+    containers.
+  - |
+    Replace instances of ``kolla_container_engine`` with
+    ``container_engine``.