From f7fa8afa5b00fdbb4f1ed4cb97e47633b23682de Mon Sep 17 00:00:00 2001
From: Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com>
Date: Fri, 11 Aug 2017 11:36:26 +0300
Subject: [PATCH] Set explicit default to enabled driver interfaces

this will allow any other devstack plugin that depends on ironic to
easier extend the list for a particular enabled interface type

current explicit defaults are copied from current ironic.conf.sample

Change-Id: I1e22a8dc4bb57e1b1e1002baab38ba2f3ba8f230
---
 devstack/lib/ironic | 49 ++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 9f7a57d94a..b1c0674983 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -142,17 +142,19 @@ IRONIC_CMD="openstack --os-baremetal-api-version $IRONIC_DEFAULT_API_VERSION bar
 
 # driver / hardware type options
 IRONIC_ENABLED_DRIVERS=${IRONIC_ENABLED_DRIVERS:-fake,pxe_ipmitool,agent_ipmitool}
-IRONIC_ENABLED_HARDWARE_TYPES=${IRONIC_ENABLED_HARDWARE_TYPES:-ipmi}
-IRONIC_ENABLED_BOOT_INTERFACES=${IRONIC_ENABLED_BOOT_INTERFACES:-}
-IRONIC_ENABLED_DEPLOY_INTERFACES=${IRONIC_ENABLED_DEPLOY_INTERFACES:-}
-IRONIC_ENABLED_MANAGEMENT_INTERFACES=${IRONIC_ENABLED_MANAGEMENT_INTERFACES:-}
-IRONIC_ENABLED_POWER_INTERFACES=${IRONIC_ENABLED_POWER_INTERFACES:-}
-IRONIC_ENABLED_CONSOLE_INTERFACES=${IRONIC_ENABLED_CONSOLE_INTERFACES:-}
-IRONIC_ENABLED_INSPECT_INTERFACES=${IRONIC_ENABLED_INSPECT_INTERFACES:-}
-IRONIC_ENABLED_RAID_INTERFACES=${IRONIC_ENABLED_RAID_INTERFACES:-}
-IRONIC_ENABLED_VENDOR_INTERFACES=${IRONIC_ENABLED_VENDOR_INTERFACES:-}
-IRONIC_ENABLED_STORAGE_INTERFACES=${IRONIC_ENABLED_STORAGE_INTERFACES:-}
-IRONIC_ENABLED_NETWORK_INTERFACES=${IRONIC_ENABLED_NETWORK_INTERFACES:-}
+IRONIC_ENABLED_HARDWARE_TYPES=${IRONIC_ENABLED_HARDWARE_TYPES:-"ipmi"}
+# list of all available driver interfaces types
+IRONIC_DRIVER_INTERFACE_TYPES="boot power management deploy console inspect raid storage network vendor"
+IRONIC_ENABLED_BOOT_INTERFACES=${IRONIC_ENABLED_BOOT_INTERFACES:-"pxe"}
+IRONIC_ENABLED_DEPLOY_INTERFACES=${IRONIC_ENABLED_DEPLOY_INTERFACES:-"iscsi,direct"}
+IRONIC_ENABLED_MANAGEMENT_INTERFACES=${IRONIC_ENABLED_MANAGEMENT_INTERFACES:-"ipmitool"}
+IRONIC_ENABLED_POWER_INTERFACES=${IRONIC_ENABLED_POWER_INTERFACES:-"ipmitool"}
+IRONIC_ENABLED_CONSOLE_INTERFACES=${IRONIC_ENABLED_CONSOLE_INTERFACES:-"no-console"}
+IRONIC_ENABLED_INSPECT_INTERFACES=${IRONIC_ENABLED_INSPECT_INTERFACES:-"no-inspect"}
+IRONIC_ENABLED_RAID_INTERFACES=${IRONIC_ENABLED_RAID_INTERFACES:-"agent,no-raid"}
+IRONIC_ENABLED_VENDOR_INTERFACES=${IRONIC_ENABLED_VENDOR_INTERFACES:-"ipmitool,no-vendor"}
+IRONIC_ENABLED_STORAGE_INTERFACES=${IRONIC_ENABLED_STORAGE_INTERFACES:-"cinder,noop"}
+IRONIC_ENABLED_NETWORK_INTERFACES=${IRONIC_ENABLED_NETWORK_INTERFACES:-"flat,noop"}
 # If IRONIC_VM_ENGING is explicitly set to "auto" or "kvm",
 # devstack will attempt to use hardware virtualization
 # (aka nested kvm). We do not enable it in the infra gates
@@ -571,14 +573,6 @@ function is_deploy_iso_required {
     return 1
 }
 
-function configure_enabled_interfaces {
-    local interface_name=$1
-    local interface_implementations=$2
-    if [[ -n $interface_implementations ]]; then
-        iniset $IRONIC_CONF_FILE DEFAULT enabled_${interface_name}_interfaces $interface_implementations
-    fi
-}
-
 # Assert that the redfish hardware type is enabled in case we are using
 # the redfish driver
 if is_deployed_by_redfish && [[ "$IRONIC_ENABLED_HARDWARE_TYPES" != *"redfish"* ]]; then
@@ -1105,16 +1099,13 @@ function configure_ironic_conductor {
     iniset $IRONIC_CONF_FILE DEFAULT enabled_drivers $IRONIC_ENABLED_DRIVERS
     iniset $IRONIC_CONF_FILE DEFAULT enabled_hardware_types $IRONIC_ENABLED_HARDWARE_TYPES
 
-    configure_enabled_interfaces "boot" $IRONIC_ENABLED_BOOT_INTERFACES
-    configure_enabled_interfaces "deploy" $IRONIC_ENABLED_DEPLOY_INTERFACES
-    configure_enabled_interfaces "management" $IRONIC_ENABLED_MANAGEMENT_INTERFACES
-    configure_enabled_interfaces "power" $IRONIC_ENABLED_POWER_INTERFACES
-    configure_enabled_interfaces "console" $IRONIC_ENABLED_CONSOLE_INTERFACES
-    configure_enabled_interfaces "inspect" $IRONIC_ENABLED_INSPECT_INTERFACES
-    configure_enabled_interfaces "raid" $IRONIC_ENABLED_RAID_INTERFACES
-    configure_enabled_interfaces "vendor" $IRONIC_ENABLED_VENDOR_INTERFACES
-    configure_enabled_interfaces "storage" $IRONIC_ENABLED_STORAGE_INTERFACES
-    configure_enabled_interfaces "network" $IRONIC_ENABLED_NETWORK_INTERFACES
+    # configure enabled interfaces
+    local iface
+    local iface_var
+    for iface in ${IRONIC_DRIVER_INTERFACE_TYPES}; do
+        iface_var="IRONIC_ENABLED_$(echo $iface | tr '[:lower:]' '[:upper:]')_INTERFACES"
+        iniset $IRONIC_CONF_FILE DEFAULT enabled_${iface}_interfaces ${!iface_var}
+    done
 
     if is_deployed_by_redfish; then
         # TODO(lucasagomes): We need to make it easier to configure