From 42035e211f9ca6a219eb5b7700e770992fd633b5 Mon Sep 17 00:00:00 2001
From: likui <likui@yovole.com>
Date: Mon, 15 Nov 2021 14:23:00 +0800
Subject: [PATCH] The deprecated iscsi deploy interface has been removed since
 xena

[1] https://docs.openstack.org/releasenotes/ironic/xena.html

Change-Id: Ic0dd9fa7ef76b647682e124b1bae52e931a38225
---
 ansible/group_vars/all.yml | 2 +-
 etc/kolla/globals.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index a1b2cfbdcd..12886bf361 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -648,7 +648,7 @@ enable_ironic: "no"
 enable_ironic_ipxe: "no"
 enable_ironic_neutron_agent: "{{ enable_neutron | bool and enable_ironic | bool }}"
 enable_ironic_pxe_uefi: "no"
-enable_iscsid: "{{ (enable_cinder | bool and enable_cinder_backend_iscsi | bool) or enable_ironic | bool }}"
+enable_iscsid: "{{ enable_cinder | bool and enable_cinder_backend_iscsi | bool }}"
 enable_kafka: "{{ enable_monasca | bool }}"
 enable_kuryr: "no"
 enable_magnum: "no"
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 02c0ac67a8..e26d02ce3c 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -347,7 +347,7 @@
 #enable_ironic_ipxe: "no"
 #enable_ironic_neutron_agent: "{{ enable_neutron | bool and enable_ironic | bool }}"
 #enable_ironic_pxe_uefi: "no"
-#enable_iscsid: "{{ (enable_cinder | bool and enable_cinder_backend_iscsi | bool) or enable_ironic | bool }}"
+#enable_iscsid: "{{ enable_cinder | bool and enable_cinder_backend_iscsi | bool }}"
 #enable_kafka: "{{ enable_monasca | bool }}"
 #enable_kibana: "{{ 'yes' if enable_central_logging | bool or enable_monasca | bool else 'no' }}"
 #enable_kuryr: "no"