Merge pull request #1024 from auniyal61/nvme-cleanup-container-cleaner

Nvme cleanup container cleaner

Author: openshift-merge-bot[bot]

roles/edpm_nova/meta/argument_specs.yml

@@ -91,9 +91,10 @@ argument_specs:
       edpm_nova_nvme_cleaner_command:
         type: str
         description: |
-          Override the cleaner command. If empty, use the default:
-          '/usr/share/openstack-nova/contrib/clean-on-delete {{ edpm_nova_nvme_cleaner_args }}'.
-          Useful in tests (e.g. 'sleep --infinity').
+          Base NVMe cleaner command.
+          Defaults to '/usr/share/openstack-nova/contrib/clean-on-delete'
+          and is concatenated with edpm_nova_nvme_cleaner_args.
+          Override only for testing (e.g. cmd '/usr/bin/sleep' with args 'infinity').
       edpm_nova_nvme_cleaner_config_dest:
         type: str
         description: |

roles/edpm_nova/molecule/default/verify.yml

@@ -7,7 +7,6 @@
   vars:
     test_helper_dir: "../../../../molecule/test-helpers"
     edpm_nova_tls_ca_src_dir: /tmp/pki
-    nvme_cleaner_template_path: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/templates/nova_nvme_cleaner_config.json.j2"
     edpm_nova_config_dest: /var/lib/openstack/config/nova
   tasks:
     - name: ensure expected directories exist
@@ -76,11 +75,6 @@
       ansible.builtin.set_fact:
         cleaner_cfg_json: "{{ cleaner_kolla_cfg.content | b64decode | from_json }}"
 
-    # auniyal: will remove it once CI is good
-    - name: debug nvme cleaner command
-      ansible.builtin.debug:
-        msg: "nvme_cleaner command: {{ cleaner_cfg_json.command }}"
-
     - name: Assert nvme cleaner kolla command content
       vars:
         cleaner_cmd: "{{ cleaner_cfg_json.command }}"

roles/edpm_nova/tasks/install.yml

@@ -82,3 +82,15 @@
     edpm_container_manage_healthcheck_disabled: true
     edpm_container_manage_config_patterns: 'nova_nvme_cleaner.json'
     edpm_container_manage_clean_orphans: false
+
+- name: Remove nvme cleaner when disabled
+  when: not edpm_nova_enable_nvme_cleaner
+  tags:
+    - install
+    - nova
+    - cleanup
+  ansible.builtin.include_role:
+    name: osp.edpm.edpm_container_rm
+  vars:
+    edpm_containers_to_rm:
+      - nova_nvme_cleaner