Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions etc/kayobe/containers/pulp/post.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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'

Expand All @@ -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/containers/pulp/pre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
become: true

- name: Ensure required Docker volumes exist
docker_volume:
kayobe_container_volume:
name: "{{ item }}"
loop:
- pulp_containers
Expand Down
3 changes: 2 additions & 1 deletion etc/kayobe/containers/redfish_exporter/post.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions etc/kayobe/seed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Comment thread
Alex-Welsh marked this conversation as resolved.
Loading