Fix the CI
* Fix the default interfaces in the devstack plugin * Do not default to netboot with a whole disk image * Add missing stestr dependency, removed unused dependencies Change-Id: I88fe1eb17acb27f18a3093367a29b5f5049d74af
This commit is contained in:
parent
dd5f3d67f5
commit
1c40f8ae57
@ -14,7 +14,6 @@
|
||||
- x/ironic-staging-drivers
|
||||
vars:
|
||||
devstack_localrc:
|
||||
IRONIC_DEFAULT_BOOT_OPTION: netboot
|
||||
IRONIC_DEFAULT_DEPLOY_INTERFACE: ""
|
||||
devstack_plugins:
|
||||
ironic-staging-drivers: https://opendev.org/x/ironic-staging-drivers
|
||||
|
@ -28,16 +28,6 @@ function setup_ironic_enabled_interfaces_for {
|
||||
ironic_iface_var="IRONIC_ENABLED_${iface_var}_INTERFACES"
|
||||
staging_ifs=$($IRONIC_STAGING_LIST_EP_CMD -t ironic.hardware.interfaces.${iface})
|
||||
|
||||
# NOTE(pas-ha) need fake management interface enabled for staging-wol hw type,
|
||||
# and even if WoL is disabled by skips or filters, no harm in enabling it any way
|
||||
if [[ $iface == 'management' ]]; then
|
||||
if [[ -n ${staging_ifs} ]]; then
|
||||
staging_ifs+=",fake"
|
||||
else
|
||||
staging_ifs='fake'
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -n ${staging_ifs} ]]; then
|
||||
iniset $IRONIC_CONF_FILE DEFAULT "enabled_${iface}_interfaces" "${!ironic_iface_var},$staging_ifs"
|
||||
fi
|
||||
@ -63,7 +53,10 @@ function update_ironic_enabled_drivers {
|
||||
# NOTE(pas-ha) find and enable any type of ironic hardware interface
|
||||
# registered by ironic-staging-drivers package (minding skips and filters)
|
||||
for i in $IRONIC_DRIVER_INTERFACE_TYPES; do
|
||||
setup_ironic_enabled_interfaces_for $i
|
||||
# NOTE(dtantsur): power and management have auto-detected defaults
|
||||
if [[ "$i" != "power" && "$i" != "management" ]]; then
|
||||
setup_ironic_enabled_interfaces_for $i
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
|
@ -3,9 +3,7 @@
|
||||
# process, which may cause wedges in the gate later.
|
||||
|
||||
coverage!=4.4,>=4.0 # Apache-2.0
|
||||
python-subunit>=1.0.0 # Apache-2.0/BSD
|
||||
# oslotest is not used explicitly but is required by the ironic tests
|
||||
oslotest>=3.2.0 # Apache-2.0
|
||||
testscenarios>=0.4 # Apache-2.0/BSD
|
||||
testtools>=2.2.0 # MIT
|
||||
os-testr>=1.0.0 # Apache-2.0
|
||||
|
||||
stestr>=2.0.0 # Apache-2.0
|
||||
|
Loading…
Reference in New Issue
Block a user