diff --git a/devstack/common_settings b/devstack/common_settings
index 59d12eb525..d649f70a59 100644
--- a/devstack/common_settings
+++ b/devstack/common_settings
@@ -7,7 +7,12 @@ fi
 # Whether configure the nodes to boot in Legacy BIOS or UEFI mode. Accepted
 # values are: "bios" or "uefi", defaults to "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
 
diff --git a/ironic/drivers/modules/drac/bios.py b/ironic/drivers/modules/drac/bios.py
index f0f83c655b..b6f59db61b 100644
--- a/ironic/drivers/modules/drac/bios.py
+++ b/ironic/drivers/modules/drac/bios.py
@@ -277,10 +277,10 @@ class DracWSManBIOS(base.BIOSInterface):
             time = timeutils.utcnow(with_timezone=True
                                     ) - timeutils.parse_isotime(str(
                                         factory_reset_time))
-            time_difference = time.seconds
+            time_difference = time.total_seconds()
             LOG.debug("Factory resetting node %(node_uuid)s "
-                      "time difference %(time_diffrence)s ",
-                      {"node_uuid": task.node.uuid, "time_diffrence":
+                      "time difference %(time_difference)s ",
+                      {"node_uuid": task.node.uuid, "time_difference":
                        time_difference})
 
             if time_difference > CONF.drac.bios_factory_reset_timeout: