From 302acd77a09be2b892094ac37a7152fb294a257e Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@citynetwork.eu>
Date: Wed, 6 Oct 2021 11:55:57 +0300
Subject: [PATCH] Remove iscsi deploy

Since iSCSI deploy has been removed [1] we should also replace iscsi deploy with direct
since it's suggested deploy option.

[1] https://review.opendev.org/c/openstack/ironic/+/789382

Change-Id: I72f166b2fdd808b623e698f44c4d77747cc987bb
---
 vars/debian.yml |  1 -
 vars/main.yml   | 37 ++++++++-----------------------------
 vars/redhat.yml |  2 --
 3 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/vars/debian.yml b/vars/debian.yml
index 7a08bc59..aed33e92 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -33,7 +33,6 @@ ironic_conductor_distro_packages:
   - qemu-utils
   - libpq-dev
   - python3-yaml
-  - open-iscsi
   - ipmitool
   - tftpd-hpa
   - gdisk
diff --git a/vars/main.yml b/vars/main.yml
index 3b4e47dd..c54c1468 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -55,20 +55,6 @@ ironic_driver_types:
     inspect: inspector
     management: ucsm
     power: ucsm
-  iscsi_ilo:
-    hardware_type: ilo
-    boot: ilo-virtual-media
-    deploy: iscsi
-    inspect: ilo
-    management: ilo
-    power: ilo
-  iscsi_irmc:
-    hardware_type: irmc
-    boot: irmc-virtual-media
-    deploy: iscsi
-    inspect: irmc
-    management: irmc
-    power: irmc
   pxe_agent_cimc:
     hardware_type: cisco-ucs-standalone
     boot: pxe
@@ -79,63 +65,56 @@ ironic_driver_types:
   pxe_drac:
     hardware_type: idrac
     boot: pxe
-    deploy: iscsi
+    deploy: direct
     inspect: idrac
     management: idrac
     power: idrac
   pxe_drac_inspector:
     hardware_type: idrac
     boot: pxe
-    deploy: iscsi
+    deploy: direct
     inspect: inspector
     management: idrac
     power: idrac
   pxe_ilo:
     hardware_type: ilo
     boot: ilo-pxe
-    deploy: iscsi
+    deploy: direct
     inspect: ilo
     management: ilo
     power: ilo
   pxe_ipmitool:
     hardware_type: ipmi
     boot: pxe
-    deploy: iscsi
+    deploy: direct
     inspect: inspector
     management: ipmitool
     power: ipmitool
   pxe_ipmitool_socat:
     hardware_type: ipmi
     boot: pxe
-    deploy: iscsi
+    deploy: direct
     inspect: inspector
     management: ipmitool
     power: ipmitool
-  pxe_iscsi_cimc:
-    hardware_type: cisco-ucs-standalone
-    boot: pxe
-    deploy: iscsi
-    inspect: inspector
-    management: cimc
-    power: cimc
   pxe_irmc:
     hardware_type: irmc
     boot: irmc-pxe
-    deploy: iscsi
+    deploy: direct
     inspect: irmc
     management: irmc
     power: irmc
   pxe_snmp:
     hardware_type: snmp
     boot: pxe
-    deploy: iscsi
+    deploy: direct
     inspect: no-inspect
     management: fake
     power: snmp
   pxe_ucs:
     hardware_type: cisco-ucs-managed
     boot: pxe
-    deploy: iscsi
+    deploy: direct
     inspect: inspector
     management: ucsm
     power: ucsm
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 705cad5c..14ff1d05 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -30,8 +30,6 @@ ironic_conductor_distro_packages:
   - syslinux-tftpboot
   - libxslt-devel
   - qemu-kvm
-  - libiscsi-utils
-  - iscsi-initiator-utils
   - ipmitool
   - tftp-server
   - gdisk