From b95de04ff471bd6db1cb522a3e44d4db8b3b2811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Thu, 29 Sep 2022 15:51:33 +0200
Subject: [PATCH] [ironic] Remove useless tasks

They served us well in Yoga but they are no longer needed in Zed.
This also avoids the early deletion of the ironic-conductor, making
it really roll.

Change-Id: I9bc85d894b5bf947ac8fca505df446b99b0bb99b
---
 ansible/roles/ironic/tasks/precheck.yml |  4 ----
 ansible/roles/ironic/tasks/upgrade.yml  | 25 -------------------------
 2 files changed, 29 deletions(-)

diff --git a/ansible/roles/ironic/tasks/precheck.yml b/ansible/roles/ironic/tasks/precheck.yml
index 005b16f753..15735b47ed 100644
--- a/ansible/roles/ironic/tasks/precheck.yml
+++ b/ansible/roles/ironic/tasks/precheck.yml
@@ -11,8 +11,6 @@
     name:
       - ironic_api
       - ironic_inspector
-      # TODO(yoctozepto): Remove ironic_ipxe entry in Zed.
-      - ironic_ipxe
       - ironic_http
   register: container_facts
 
@@ -46,8 +44,6 @@
     timeout: 1
     state: stopped
   when:
-    # TODO(yoctozepto): Remove ironic_ipxe entry in Zed.
-    - container_facts['ironic_ipxe'] is not defined
     - container_facts['ironic_http'] is not defined
     - inventory_hostname in groups['ironic-http']
 
diff --git a/ansible/roles/ironic/tasks/upgrade.yml b/ansible/roles/ironic/tasks/upgrade.yml
index a16115fed9..de5d8ffaab 100644
--- a/ansible/roles/ironic/tasks/upgrade.yml
+++ b/ansible/roles/ironic/tasks/upgrade.yml
@@ -27,33 +27,8 @@
   run_once: true
   when: not ironic_upgrade_skip_wait_check | bool
 
-# TODO(yoctozepto): Remove this task in Zed.
-- name: Remove old Ironic containers
-  become: true
-  kolla_docker:
-    action: "stop_and_remove_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item }}"
-  with_items:
-    # NOTE(yoctozepto): Removing conductor to avoid it
-    # thinking that the tftp and http servers are available.
-    - ironic_conductor
-    - ironic_pxe
-    - ironic_ipxe
-
 - include_tasks: rolling_upgrade.yml
   when: ironic_enable_rolling_upgrade | bool
 
 - include_tasks: legacy_upgrade.yml
   when: not ironic_enable_rolling_upgrade | bool
-
-# TODO(yoctozepto): Remove this task in Zed.
-- name: Remove old Ironic volumes
-  become: true
-  kolla_docker:
-    action: "remove_volume"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item }}"
-  with_items:
-    - ironic_pxe
-    - ironic_ipxe