Skip to content

Commit 08d10d1

Browse files
committed
Fix infinite loop in seed container deployment
The deploy.yml playbook previously called deploy-container.yml, but this was changed to call itself when podman support was added [1]. It would then recursively loop until failure. This change reverts that, so deploy-container.yml is called instead. Add a test to seed jobs, to catch any regression in CI. [1] https://review.opendev.org/c/openstack/kayobe/+/909686 Closes-Bug: #2114845 Change-Id: I825ab7331fbe8f28c17b87ff79a436144426a78c (cherry picked from commit 7bd7929)
1 parent 46ceb39 commit 08d10d1

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

ansible/roles/manage-containers/tasks/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
become: "{{ container_engine == 'podman' }}"
1111

1212
- name: Deploy containers (loop)
13-
include_tasks: deploy.yml
13+
include_tasks: deploy-container.yml
1414
vars:
1515
container_name: "{{ item.key }}"
1616
container_config: "{{ item.value }}"

playbooks/kayobe-seed-base/overrides.yml.j2

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,16 @@ kolla_base_distro: "{% raw %}{{ 'rocky' if os_distribution == 'centos' else os_d
5757

5858
# Support overriding container_engine
5959
container_engine: "{{ container_engine }}"
60+
61+
# Test deployment of custom seed containers
62+
seed_containers:
63+
node_exporter:
64+
image: "quay.io/prometheus/node-exporter"
65+
tag: "latest"
66+
67+
{% if ansible_os_family == "Debian" %}
68+
# TODO(priteau): Required for running some containers on Ubuntu + Podman.
69+
# Remove once installed by ansible-collection-kolla.
70+
dev_tools_packages_extra:
71+
- "catatonit"
72+
{% endif %}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes an infinite loop when deploying seed containers.
5+
`LP#2114845 <https://bugs.launchpad.net/kayobe/+bug/2114845>`__

0 commit comments

Comments
 (0)