diff options
| author | Zuul <zuul@review.openstack.org> | 2017-11-09 11:12:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-11-09 11:12:34 +0000 |
| commit | 0a2d87f40090eba87cac115409c4cc84c21f2113 (patch) | |
| tree | 362d2371ebbd75674c1f72d8fe4e20b6fe0ac1e4 /devstack | |
| parent | 9175c2325e438a01cd9c8c9ee2d4f49f713127d1 (diff) | |
| parent | 1b23af1c77c78706cd5c101fc788070bfed3e89d (diff) | |
| download | ironic-0a2d87f40090eba87cac115409c4cc84c21f2113.tar.gz | |
Merge "devstack: Clean up some of the devstack code"
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/lib/ironic | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index b7a4ce413..e8bb33b09 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -145,26 +145,26 @@ 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_CONSOLE_INTERFACES=${IRONIC_ENABLED_CONSOLE_INTERFACES:-"no-console"} IRONIC_ENABLED_DEPLOY_INTERFACES=${IRONIC_ENABLED_DEPLOY_INTERFACES:-"iscsi,direct"} +IRONIC_ENABLED_INSPECT_INTERFACES=${IRONIC_ENABLED_INSPECT_INTERFACES:-"no-inspect"} IRONIC_ENABLED_MANAGEMENT_INTERFACES=${IRONIC_ENABLED_MANAGEMENT_INTERFACES:-"ipmitool"} +IRONIC_ENABLED_NETWORK_INTERFACES=${IRONIC_ENABLED_NETWORK_INTERFACES:-"flat,noop"} 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"} +IRONIC_ENABLED_VENDOR_INTERFACES=${IRONIC_ENABLED_VENDOR_INTERFACES:-"ipmitool,no-vendor"} # for usage with hardware types IRONIC_DEFAULT_BOOT_INTERFACE=${IRONIC_DEFAULT_BOOT_INTERFACE:-} +IRONIC_DEFAULT_CONSOLE_INTERFACE=${IRONIC_DEFAULT_CONSOLE_INTERFACE:-} IRONIC_DEFAULT_DEPLOY_INTERFACE=${IRONIC_DEFAULT_DEPLOY_INTERFACE:-} +IRONIC_DEFAULT_INSPECT_INTERFACE=${IRONIC_DEFAULT_INSPECT_INTERFACE:-} IRONIC_DEFAULT_MANAGEMENT_INTERFACE=${IRONIC_DEFAULT_MANAGEMENT_INTERFACE:-} +IRONIC_DEFAULT_NETWORK_INTERFACE=${IRONIC_DEFAULT_NETWORK_INTERFACE:-} IRONIC_DEFAULT_POWER_INTERFACE=${IRONIC_DEFAULT_POWER_INTERFACE:-} -IRONIC_DEFAULT_CONSOLE_INTERFACE=${IRONIC_DEFAULT_CONSOLE_INTERFACE:-} -IRONIC_DEFAULT_INSPECT_INTERFACE=${IRONIC_DEFAULT_INSPECT_INTERFACE:-} IRONIC_DEFAULT_RAID_INTERFACE=${IRONIC_DEFAULT_RAID_INTERFACE:-} -IRONIC_DEFAULT_VENDOR_INTERFACE=${IRONIC_DEFAULT_VENDOR_INTERFACE:-} IRONIC_DEFAULT_STORAGE_INTERFACE=${IRONIC_DEFAULT_STORAGE_INTERFACE:-} -IRONIC_DEFAULT_NETWORK_INTERFACE=${IRONIC_DEFAULT_NETWORK_INTERFACE:-} +IRONIC_DEFAULT_VENDOR_INTERFACE=${IRONIC_DEFAULT_VENDOR_INTERFACE:-} # If IRONIC_VM_ENGINE 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 @@ -1127,11 +1127,13 @@ function configure_ironic_conductor { # configure enabled and default interfaces local iface local iface_var + local iface_uppercase local default_iface_var for iface in ${IRONIC_DRIVER_INTERFACE_TYPES}; do - iface_var="IRONIC_ENABLED_${iface^^}_INTERFACES" + iface_uppercase="${iface^^}" + iface_var="IRONIC_ENABLED_${iface_uppercase}_INTERFACES" iniset $IRONIC_CONF_FILE DEFAULT enabled_${iface}_interfaces ${!iface_var} - default_iface_var="IRONIC_DEFAULT_${iface^^}_INTERFACE" + default_iface_var="IRONIC_DEFAULT_${iface_uppercase}_INTERFACE" if [[ -n "${!default_iface_var}" ]]; then if [[ ! "${!iface_var}" =~ ${!default_iface_var} ]]; then die $LINENO "Default interface set for ${iface} interface is not enabled." |