diff --git a/etc/kayobe/containers/pulp/post.yml b/etc/kayobe/containers/pulp/post.yml index 7e8154f024..2b89f91b39 100644 --- a/etc/kayobe/containers/pulp/post.yml +++ b/etc/kayobe/containers/pulp/post.yml @@ -10,7 +10,7 @@ - name: Set the Pulp admin password become: true command: >- - docker exec -u root pulp + {{ kolla_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 + {{ kolla_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 + {{ kolla_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 }}" diff --git a/etc/kayobe/containers/pulp/pre.yml b/etc/kayobe/containers/pulp/pre.yml index 5e53a57ce5..c47012c06b 100644 --- a/etc/kayobe/containers/pulp/pre.yml +++ b/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 diff --git a/etc/kayobe/containers/redfish_exporter/post.yml b/etc/kayobe/containers/redfish_exporter/post.yml index 39b3e1e2ee..6b39c005ff 100644 --- a/etc/kayobe/containers/redfish_exporter/post.yml +++ b/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: >- + {{ kolla_container_engine | default("docker") }} kill -s SIGHUP redfish_exporter when: - redfish_exporter_config is changed diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml index b6c4706773..0d29ad7b5e 100644 --- a/etc/kayobe/seed.yml +++ b/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 diff --git a/releasenotes/notes/seed-container-image-locations-3b83bb42f6c50bab.yaml b/releasenotes/notes/seed-container-image-locations-3b83bb42f6c50bab.yaml new file mode 100644 index 0000000000..55e0ecd24e --- /dev/null +++ b/releasenotes/notes/seed-container-image-locations-3b83bb42f6c50bab.yaml @@ -0,0 +1,10 @@ +--- +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.