Skip to content

Commit

Permalink
Merge pull request #364 from fultonj/edpm_container_manage_ignore_ceph
Browse files Browse the repository at this point in the history
Do not attempt to manage collocated Ceph containers
  • Loading branch information
openshift-merge-robot authored Sep 25, 2023
2 parents 161921a + 0e6058c commit e9d5629
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
3 changes: 3 additions & 0 deletions docs/source/roles/role-edpm_container_manage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ This Ansible role allows to do the following tasks:

* The container config_id doesn't match with the one in input.

* The container's name starts with "ceph". Ceph containers are not
managed by this role.

Once the previous conditions checked, then these reasons will make the
containers deleted:

Expand Down
10 changes: 9 additions & 1 deletion roles/edpm_container_manage/tasks/delete_orphan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@
when:
- edpm_container_manage_cli == 'podman'

- name: Exclude Ceph containers from podman container list
ansible.builtin.set_fact:
filtered_containers: "{{ filtered_containers | default([]) + [item] }}"
when:
- not (item['Name'] | regex_search('^ceph.*'))
loop: "{{ podman_containers.containers }}"

- name: "Delete orphan containers managed by Podman for {{ edpm_container_manage_config }}"
when:
- edpm_container_manage_systemd_teardown | bool
Expand All @@ -28,6 +35,7 @@
vars:
edpm_container_cli: "{{ edpm_container_manage_cli }}"
edpm_containers_to_rm: >-
{{ podman_containers.containers | osp.edpm.needs_delete(config=all_containers_hash,
{{ filtered_containers | default([]) |
osp.edpm.needs_delete(config=all_containers_hash,
config_id=edpm_container_manage_config_id, check_config=False,
clean_orphans=True) }}

0 comments on commit e9d5629

Please sign in to comment.