openstack
/
fuel-devops
Code Issues Proposed changes

Merge "Reboot libvirt VM in case of boot failure"

This commit is contained in:
Jenkins 2014-08-18 10:52:37 +00:00 committed by Gerrit Code Review
parent 5453f6a0b1 566f22d45f
commit b4659cff27
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devops/driver/libvirt/libvirt_driver.py
View File

@ -43,6 +43,9 @@ class DevopsDriver(object):
if settings.VNC_PASSWORD:
self.vnc_password = settings.VNC_PASSWORD
if settings.REBOOT_TIMEOUT:
self.reboot_timeout = settings.REBOOT_TIMEOUT
def __del__(self):
self.conn.close()

3
devops/driver/libvirt/libvirt_xml_builder.py
View File

@ -163,6 +163,9 @@ class LibvirtXMLBuilder(object):
node_xml.type(node.os_type, arch=node.architecture)
for boot_dev in json.loads(node.boot):
node_xml.boot(dev=boot_dev)
if self.driver.reboot_timeout:
node_xml.bios(rebootTimeout='{0}'.format(
self.driver.reboot_timeout))
with node_xml.devices:
node_xml.emulator(emulator)