summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-18 23:11:36 +0000
committerGerrit Code Review <review@openstack.org>2017-07-18 23:11:36 +0000
commitd9983f1eecc47db7682f4faf4d885b8be87a494b (patch)
tree8806a3b777f7cf466f2d40941d91ca5dbeb197fd
parentf641463cfb1dc01bf254bcef2e35dad3fe06c658 (diff)
parent9ad88d014d0b7b0d031aa110fc31c8b112658ddc (diff)
downloadironic-d9983f1eecc47db7682f4faf4d885b8be87a494b.tar.gz
Merge "Add missing parameter descriptions."
-rw-r--r--ironic/conductor/rpcapi.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/ironic/conductor/rpcapi.py b/ironic/conductor/rpcapi.py
index eed896e04..c3984f6a6 100644
--- a/ironic/conductor/rpcapi.py
+++ b/ironic/conductor/rpcapi.py
@@ -428,6 +428,7 @@ class ConductorAPI(object):
:param context: request context.
:param node_id: node id or uuid.
+ :param topic: RPC topic. Defaults to self.topic.
:raises: NodeLocked if node is locked by another conductor.
:raises: NodeAssociated if the node contains an instance
associated with it.
@@ -561,6 +562,7 @@ class ConductorAPI(object):
:mod:`ironic.common.boot_devices`.
:param persistent: Whether to set next-boot, or make the change
permanent. Default: False.
+ :param topic: RPC topic. Defaults to self.topic.
:raises: NodeLocked if node is locked by another conductor.
:raises: UnsupportedDriverExtension if the node's driver doesn't
support management.
@@ -579,6 +581,7 @@ class ConductorAPI(object):
:param context: request context.
:param node_id: node id or uuid.
+ :param topic: RPC topic. Defaults to self.topic.
:raises: NodeLocked if node is locked by another conductor.
:raises: UnsupportedDriverExtension if the node's driver doesn't
support management.
@@ -604,6 +607,7 @@ class ConductorAPI(object):
:param context: request context.
:param node_id: node id or uuid.
+ :param topic: RPC topic. Defaults to self.topic.
:raises: NodeLocked if node is locked by another conductor.
:raises: UnsupportedDriverExtension if the node's driver doesn't
support management or management.inject_nmi.
@@ -622,6 +626,7 @@ class ConductorAPI(object):
:param context: request context.
:param node_id: node id or uuid.
+ :param topic: RPC topic. Defaults to self.topic.
:raises: NodeLocked if node is locked by another conductor.
:raises: UnsupportedDriverExtension if the node's driver doesn't
support management.