From 7936ed427fda176bd507333173f09ffc6f9cbf5e Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@ubuntu.com>
Date: Mon, 24 Mar 2014 16:25:55 -0700
Subject: [PATCH] Pass no arguments to _wait_for_provision_state()
Commit 39e0a28d modified the inner function in destroy() to take
no arguments but its caller was not updated. This avoids a TypeError
during Nova instance deletion.
Closes-Bug: #1296918
Change-Id: I865b1ef92b0a3736e0e6295892c663f7e4ab792e
---
ironic/nova/virt/ironic/driver.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/ironic/nova/virt/ironic/driver.py b/ironic/nova/virt/ironic/driver.py
index 9c468c0013..b613b38be9 100644
--- a/ironic/nova/virt/ironic/driver.py
+++ b/ironic/nova/virt/ironic/driver.py
@@ -522,8 +522,7 @@ class IronicDriver(virt_driver.ComputeDriver):
self.tries += 1
self.tries = 0
- timer = loopingcall.FixedIntervalLoopingCall(_wait_for_provision_state,
- node_uuid)
+ timer = loopingcall.FixedIntervalLoopingCall(_wait_for_provision_state)
timer.start(interval=CONF.ironic.api_retry_interval).wait()
# remove the instance uuid