Skip to content

Commit

Permalink
Revert "Do not attempt to manage collocated Ceph containers"
Browse files Browse the repository at this point in the history
This reverts commit 0e6058c.

This breaks HCI but HCI is not yet in CI so a follow up patch
will fix what this patch breaks for people deploying HCI.

The commit being reverted introduced a task that we still
the functionality of, however, its implementation was not
efficient and takes too long to run in the CI as documented:

openstack-k8s-operators/data-plane-adoption#171

We still need to exclude the ceph containers but will need
to do it with less computational resources (e.g. maybe pure
jinja will be faster or we might need a custom filter).

Conflicts:
	roles/edpm_container_manage/tasks/delete_orphan.yml
  • Loading branch information
fultonj committed Oct 3, 2023
1 parent fc1fb80 commit eea2367
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
3 changes: 0 additions & 3 deletions docs/source/roles/role-edpm_container_manage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ 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
11 changes: 1 addition & 10 deletions roles/edpm_container_manage/tasks/delete_orphan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,6 @@
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 }}"
no_log: true

- name: "Delete orphan containers managed by Podman for {{ edpm_container_manage_config }}"
when:
- edpm_container_manage_systemd_teardown | bool
Expand All @@ -36,7 +28,6 @@
vars:
edpm_container_cli: "{{ edpm_container_manage_cli }}"
edpm_containers_to_rm: >-
{{ filtered_containers | default([]) |
osp.edpm.needs_delete(config=all_containers_hash,
{{ podman_containers.containers | 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 eea2367

Please sign in to comment.