From 9ee635193ece18a448e5b5987591f6220d1dcdd0 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Fri, 30 Apr 2021 17:25:21 +0200 Subject: [PATCH] Remove support for the iscsi deploy Change-Id: I0834babfc2cb80f354da0de88f33831116b50e34 --- .../defaults/required_defaults_Debian_family.yml | 3 --- .../defaults/required_defaults_Fedora.yml | 3 --- .../defaults/required_defaults_RedHat_family.yml | 3 --- .../defaults/required_defaults_Suse_family.yml | 3 --- playbooks/roles/bifrost-ironic-install/tasks/install.yml | 6 ------ releasenotes/notes/no-iscsi-0f7fbb0814b8cd18.yaml | 4 ++++ 6 files changed, 4 insertions(+), 18 deletions(-) create mode 100644 releasenotes/notes/no-iscsi-0f7fbb0814b8cd18.yaml diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml index 26e9df980..a61da183d 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml @@ -45,6 +45,3 @@ required_packages: # package list as the installation causes name resolution changes that can # temporarily block packages following it while the system is being # reconfigured. See: https://review.opendev.org/#/c/223813 -iscsi_required_packages: - - open-iscsi - - gdisk diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora.yml index 58ce8c300..c1b50c3ca 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora.yml @@ -41,6 +41,3 @@ required_packages: - wget - xinetd - dosfstools -iscsi_required_packages: - - iscsi-initiator-utils - - gdisk diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml index 30086948c..e6cec7ccd 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml @@ -42,6 +42,3 @@ required_packages: - grub2-efi-x64 - shim-x64 - dosfstools -iscsi_required_packages: - - iscsi-initiator-utils - - gdisk diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml index f6da1d63b..2a9df685c 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml @@ -48,6 +48,3 @@ required_packages: - grub2-x86_64-efi - shim - dosfstools -iscsi_required_packages: - - open-iscsi - - gptfdisk diff --git a/playbooks/roles/bifrost-ironic-install/tasks/install.yml b/playbooks/roles/bifrost-ironic-install/tasks/install.yml index 1f982ba11..07e4d8f6c 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/install.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/install.yml @@ -31,12 +31,6 @@ - name: "Install vendor dependencies" import_tasks: vendor_deps.yml -- name: "Install iSCSI client and dependencies if iscsi deploy interface is enabled" - package: - name: "{{ iscsi_required_packages }}" - state: present - when: not (skip_install | bool) and 'iscsi' in enabled_deploy_interfaces - - name: "IPA-builder - Install" include_role: name: bifrost-pip-install diff --git a/releasenotes/notes/no-iscsi-0f7fbb0814b8cd18.yaml b/releasenotes/notes/no-iscsi-0f7fbb0814b8cd18.yaml new file mode 100644 index 000000000..91e91e26b --- /dev/null +++ b/releasenotes/notes/no-iscsi-0f7fbb0814b8cd18.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Removes support for the deprecated ``iscsi`` deploy interface.