Read default cirros version from stackrc
Workaround for grenade jobs to read CIRROS_VERSION variable from stackrc. We also give the possibility to specify a custom CIRROS_VERSION In addition, fix transient iDRAC WS-Man BIOS test. Depends-On: https://review.opendev.org/c/openstack/ironic/+/786387 Change-Id: Ic7f5dae5e6aa6916f0a7d73f43cc9552349385c5
This commit is contained in:
parent
b4d8a493d9
commit
df368cbd8a
@ -7,7 +7,12 @@ fi
|
|||||||
# Whether configure the nodes to boot in Legacy BIOS or UEFI mode. Accepted
|
# Whether configure the nodes to boot in Legacy BIOS or UEFI mode. Accepted
|
||||||
# values are: "bios" or "uefi", defaults to "bios".
|
# values are: "bios" or "uefi", defaults to "bios".
|
||||||
IRONIC_BOOT_MODE=${IRONIC_BOOT_MODE:-bios}
|
IRONIC_BOOT_MODE=${IRONIC_BOOT_MODE:-bios}
|
||||||
CIRROS_VERSION=${CIRROS_VERSION:-"0.5.1"}
|
|
||||||
|
CIRROS_VERSION_DEVSTACK=$(set +o xtrace &&
|
||||||
|
source $TOP_DIR/stackrc &&
|
||||||
|
echo $CIRROS_VERSION)
|
||||||
|
|
||||||
|
CIRROS_VERSION=${CIRROS_VERSION:-$CIRROS_VERSION_DEVSTACK}
|
||||||
|
|
||||||
IRONIC_DEFAULT_IMAGE_NAME=cirros-${CIRROS_VERSION}-x86_64-uec
|
IRONIC_DEFAULT_IMAGE_NAME=cirros-${CIRROS_VERSION}-x86_64-uec
|
||||||
|
|
||||||
|
@ -277,10 +277,10 @@ class DracWSManBIOS(base.BIOSInterface):
|
|||||||
time = timeutils.utcnow(with_timezone=True
|
time = timeutils.utcnow(with_timezone=True
|
||||||
) - timeutils.parse_isotime(str(
|
) - timeutils.parse_isotime(str(
|
||||||
factory_reset_time))
|
factory_reset_time))
|
||||||
time_difference = time.seconds
|
time_difference = time.total_seconds()
|
||||||
LOG.debug("Factory resetting node %(node_uuid)s "
|
LOG.debug("Factory resetting node %(node_uuid)s "
|
||||||
"time difference %(time_diffrence)s ",
|
"time difference %(time_difference)s ",
|
||||||
{"node_uuid": task.node.uuid, "time_diffrence":
|
{"node_uuid": task.node.uuid, "time_difference":
|
||||||
time_difference})
|
time_difference})
|
||||||
|
|
||||||
if time_difference > CONF.drac.bios_factory_reset_timeout:
|
if time_difference > CONF.drac.bios_factory_reset_timeout:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user