Fix introspection restart with unlocking node
Use wait_for_node_reservation method from cloud.baremetal class, not from cloud.baremetal_introspection. Change-Id: Iaf2d410a2da74f062f1ad0de49c76beba8548f9a
This commit is contained in:
parent
bd02601809
commit
1804a43d86
|
@ -145,6 +145,7 @@ class IntrospectionManagement(object):
|
||||||
node_timeout,
|
node_timeout,
|
||||||
retry_timeout):
|
retry_timeout):
|
||||||
self.client = cloud.baremetal_introspection
|
self.client = cloud.baremetal_introspection
|
||||||
|
self.cloud = cloud
|
||||||
self.module = module
|
self.module = module
|
||||||
self.concurrency = concurrency
|
self.concurrency = concurrency
|
||||||
self.max_retries = max_retries
|
self.max_retries = max_retries
|
||||||
|
@ -168,6 +169,7 @@ class IntrospectionManagement(object):
|
||||||
queue = (NodeIntrospection(
|
queue = (NodeIntrospection(
|
||||||
uuid,
|
uuid,
|
||||||
self.client,
|
self.client,
|
||||||
|
self.cloud,
|
||||||
self.node_timeout,
|
self.node_timeout,
|
||||||
self.max_retries,
|
self.max_retries,
|
||||||
self.retry_timeout,
|
self.retry_timeout,
|
||||||
|
@ -232,9 +234,16 @@ class NodeIntrospection:
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
node_id, os_client, timeout, max_retries, retry_timeout, log):
|
node_id,
|
||||||
|
os_client,
|
||||||
|
os_cloud,
|
||||||
|
timeout,
|
||||||
|
max_retries,
|
||||||
|
retry_timeout,
|
||||||
|
log):
|
||||||
self.node_id = node_id
|
self.node_id = node_id
|
||||||
self.os_client = os_client
|
self.os_client = os_client
|
||||||
|
self.os_cloud = os_cloud
|
||||||
self.timeout = timeout
|
self.timeout = timeout
|
||||||
self.max_retries = max_retries
|
self.max_retries = max_retries
|
||||||
self.log = log
|
self.log = log
|
||||||
|
@ -258,7 +267,7 @@ class NodeIntrospection:
|
||||||
self.os_client.wait_for_introspection(
|
self.os_client.wait_for_introspection(
|
||||||
self.node_id, timeout=self.timeout, ignore_error=True)
|
self.node_id, timeout=self.timeout, ignore_error=True)
|
||||||
# Wait until node is unlocked
|
# Wait until node is unlocked
|
||||||
self.os_client.wait_for_node_reservation(
|
self.os_cloud.baremetal.wait_for_node_reservation(
|
||||||
self.node_id, timeout=self.retry_timeout)
|
self.node_id, timeout=self.retry_timeout)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.log("ERROR Node %s can't restart introspection because can't "
|
self.log("ERROR Node %s can't restart introspection because can't "
|
||||||
|
|
Loading…
Reference in New Issue