openstack/ironic
Code Issues Proposed changes

Update nova driver's power_off() parameters

Browse Source 
The nova driver's power_off() function received two new parameters
in commit c07ed15415c0ec3c5862f437f440632eff1e94df (nova).  The
in-tree drivers were all updated.  This updates the Ironic driver
and avoids a traceback during power off.

Change-Id: I0cbe7d954f0bcc16f7249304321a08d457eaba52
Closes-bug: #1359943
This commit is contained in:
Adam Gandelman
2014-08-21 13:14:30 -07:00
parent e0e0291efd
commit 080890efa5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ironic/nova/virt/ironic/driver.py
View File

@@ -728,11 +728,14 @@ class IronicDriver(virt_driver.ComputeDriver):
node = _validate_instance_and_node(icli, instance) node = _validate_instance_and_node(icli, instance)
icli.call("node.set_power_state", node.uuid, 'reboot') icli.call("node.set_power_state", node.uuid, 'reboot')
def power_off(self, instance): def power_off(self, instance, timeout=0, retry_interval=0):
"""Power off the specified instance. """Power off the specified instance.
:param instance: The instance object. :param instance: The instance object.
:param timeout: time to wait for node to shutdown. Ignored by
this driver.
:param retry_interval: How often to signal node while waiting
for it to shutdown. Ignored by this driver.
""" """
icli = client_wrapper.IronicClientWrapper() icli = client_wrapper.IronicClientWrapper()
node = _validate_instance_and_node(icli, instance) node = _validate_instance_and_node(icli, instance)