From 0f0352a5b856c44f589d1ab6adb189142216498a Mon Sep 17 00:00:00 2001 From: Arx Cruz Date: Wed, 9 Jun 2021 13:41:17 +0200 Subject: [PATCH] Remove iscsi from IronicEnabledDeployInterfaces Iscsi is deprecated and should no longer be used Related-Bug: #1931417 Change-Id: If6893492a854956b6b3b19cf5ed36411daf0a1b0 --- tripleoclient/tests/v1/undercloud/test_config.py | 6 +++--- tripleoclient/v1/undercloud_config.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tripleoclient/tests/v1/undercloud/test_config.py b/tripleoclient/tests/v1/undercloud/test_config.py index 0f21e963f..d9c11637a 100644 --- a/tripleoclient/tests/v1/undercloud/test_config.py +++ b/tripleoclient/tests/v1/undercloud/test_config.py @@ -56,7 +56,7 @@ class TestProcessDriversAndHardwareTypes(base.TestCase): 'IronicEnabledHardwareTypes': ['ipmi', 'redfish', 'ilo', 'idrac'], 'IronicEnabledBootInterfaces': ['ipxe', 'pxe', 'ilo-pxe'], 'IronicEnabledBiosInterfaces': ['no-bios', 'ilo', 'redfish'], - 'IronicEnabledDeployInterfaces': ['direct', 'iscsi', 'ansible'], + 'IronicEnabledDeployInterfaces': ['direct', 'ansible'], 'IronicEnabledInspectInterfaces': ['inspector', 'no-inspect', 'redfish', 'idrac', 'ilo'], 'IronicEnabledManagementInterfaces': ['ipmitool', 'redfish', @@ -81,7 +81,7 @@ class TestProcessDriversAndHardwareTypes(base.TestCase): 'IronicEnabledHardwareTypes': ['redfish', 'ipmi'], 'IronicEnabledBootInterfaces': ['ipxe', 'pxe'], 'IronicEnabledBiosInterfaces': ['no-bios', 'redfish'], - 'IronicEnabledDeployInterfaces': ['direct', 'iscsi', 'ansible'], + 'IronicEnabledDeployInterfaces': ['direct', 'ansible'], 'IronicEnabledInspectInterfaces': ['inspector', 'no-inspect', 'redfish'], 'IronicEnabledManagementInterfaces': ['ipmitool', 'redfish', @@ -112,7 +112,7 @@ class TestProcessDriversAndHardwareTypes(base.TestCase): 'irmc-pxe', 'fake'], 'IronicEnabledBiosInterfaces': ['no-bios', 'ilo', 'irmc', 'redfish'], - 'IronicEnabledDeployInterfaces': ['direct', 'iscsi', 'ansible', + 'IronicEnabledDeployInterfaces': ['direct', 'ansible', 'fake'], 'IronicEnabledInspectInterfaces': ['inspector', 'no-inspect', 'redfish', 'idrac', 'ilo', diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py index fc54f31ca..eafd6783e 100644 --- a/tripleoclient/v1/undercloud_config.py +++ b/tripleoclient/v1/undercloud_config.py @@ -186,7 +186,7 @@ def _process_drivers_and_hardware_types(conf, env): if 'snmp' in enabled_hardware_types: power_interfaces.append('snmp') - deploy_interfaces = ['direct', 'iscsi', 'ansible'] + deploy_interfaces = ['direct', 'ansible'] if 'fake-hardware' in enabled_hardware_types: deploy_interfaces.append('fake') boot_interfaces.append('fake')