Skip to content

Commit 0d81fbe

Browse files
committed
Add support for Podman seed containers
Use Kayobe action_plugins to direct calls to the correct container_engine.
1 parent a35363c commit 0d81fbe

4 files changed

Lines changed: 11 additions & 6 deletions

File tree

etc/kayobe/containers/pulp/post.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
- name: Set the Pulp admin password
1111
become: true
1212
command: >-
13-
docker exec -u root pulp
13+
{{ kolla_container_engine | default("docker") }} exec -u root pulp
1414
bash -c
1515
"pulpcore-manager reset-admin-password -p \"{{ pulp_password }}\""
1616
no_log: true
@@ -21,7 +21,7 @@
2121
- name: Manage Pulp content checksums
2222
become: true
2323
command: >-
24-
docker exec -u root pulp
24+
{{ kolla_container_engine | default("docker") }} exec -u root pulp
2525
bash -c
2626
'pulpcore-manager handle-artifact-checksums'
2727
when:
@@ -31,7 +31,7 @@
3131
- name: Manage Pulp content image data
3232
become: true
3333
command: >-
34-
docker exec -u root pulp
34+
{{ kolla_container_engine | default("docker") }} exec -u root pulp
3535
bash -c
3636
'pulpcore-manager container-handle-image-data'
3737
@@ -48,7 +48,7 @@
4848
- pulp_stack_password is defined and pulp_stack_password | length > 0
4949

5050
- name: Login to docker registry
51-
docker_login:
51+
kayobe_container_login:
5252
registry_url: "{{ kolla_docker_registry or omit }}"
5353
username: "{{ kolla_docker_registry_username }}"
5454
password: "{{ kolla_docker_registry_password }}"

etc/kayobe/containers/pulp/pre.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
become: true
77

88
- name: Ensure required Docker volumes exist
9-
docker_volume:
9+
kayobe_container_volume:
1010
name: "{{ item }}"
1111
loop:
1212
- pulp_containers
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
- name: Restart redfish exporter container if config changed
33
become: true
4-
command: docker kill -s SIGHUP redfish_exporter
4+
command: >-
5+
{{ kolla_container_engine | default("docker") }} kill -s SIGHUP redfish_exporter
56
when:
67
- redfish_exporter_config is changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ fixes:
44
Ensure that seed hosts using Podman pull seed container
55
images using their fully-qualified name, rather than
66
their short-name.
7+
- |
8+
Ensure that the container_engine variable is respected
9+
when running pre.yaml and post.yaml for seed
10+
containers.

0 commit comments

Comments
 (0)