bastion: added storage cleanup steps

Author: kononovn

playbooks/deploy-ocp-hybrid-multinode.yml

@@ -360,6 +360,7 @@
     pull_secret_file: /tmp/pullsecret
     api_vips: "{{ api_vips_string | from_yaml }}"
     ingress_vips: "{{ ingress_vips_string | from_yaml }}"
+    http_directory: /opt/http_store
 
   tasks:
     - name: Populate pull secret
@@ -374,6 +375,12 @@
         extra_machine_networks: "{{ extra_machine_networks_string | from_yaml }}"
         extra_service_networks: "{{ extra_service_networks_string | from_yaml }}"
 
+    - name: Remove all Podman images
+      containers.podman.podman_prune:
+        image: true
+        image_filters:
+          dangling_only: false
+
     - name: Prepare disconnected infrastructure
       become: true
       when: internal_registry | bool or disconnected | bool
@@ -504,11 +511,18 @@
         ocp_version_facts_release: "{{ release }}"
         ocp_version_release_age_max_days: "{{ release_age_max_days | default(10000) | int }}"
 
+    - name: Clean HTTP storage directory
+      become: true
+      ansible.builtin.file:
+        path: "{{ http_directory }}"
+        state: absent
+
     - name: Setup HTTP storage
       ansible.builtin.import_role:
         name: redhatci.ocp.setup_http_store
       vars:
         http_port: "{{ share_http_iso_port }}"
+        http_dir: "{{ http_directory }}"
 
     - name: Deploy/Redeploy OCP client
       ansible.builtin.import_role:

playbooks/deploy-ocp-sno.yml

@@ -206,8 +206,15 @@
     ipv6_only: false
     disconnected: false
     pull_secret_file: /tmp/pullsecret
+    http_directory: /opt/http_store
   tasks:
 
+    - name: Remove all Podman images
+      containers.podman.podman_prune:
+        image: true
+        image_filters:
+          dangling_only: false
+
     - name: Render bastion variables from inventory strings
       delegate_to: bastion
       ansible.builtin.set_fact:
@@ -273,9 +280,16 @@
       ansible.builtin.import_role:
         name: ocp_version_facts
 
+    - name: Clean HTTP storage directory
+      become: true
+      ansible.builtin.file:
+        path: "{{ http_directory }}"
+        state: absent
+
     - name: Set up HTTP storage
       vars:
         http_port: "{{ share_http_iso_port }}"
+        http_dir: "{{ http_directory }}"
       ansible.builtin.import_role:
         name: redhatci.ocp.setup_http_store
 

playbooks/roles/ocp_operator_mirror/tasks/main.yaml

@@ -43,6 +43,11 @@
   ansible.builtin.include_tasks: reset_registry_storage.yaml
   when: not (ocp_operator_mirror_skip_internal_registry_cleanup | default(false) | bool)
 
+- name: Reset oc-mirror cache
+  ansible.builtin.file:
+    path: "{{ ansible_env.HOME }}/.oc-mirror/.cache"
+    state: absent
+
 - name: Configure registry authentication
   ansible.builtin.include_tasks: set_auth.yaml