diff --git a/tripleoclient/tests/workflows/test_baremetal.py b/tripleoclient/tests/workflows/test_baremetal.py index db9155651..e96650e26 100644 --- a/tripleoclient/tests/workflows/test_baremetal.py +++ b/tripleoclient/tests/workflows/test_baremetal.py @@ -97,7 +97,7 @@ class TestBaremetalWorkflows(fakes.FakePlaybookExecution): ), [mock.ANY]) def test_provide_success(self): - baremetal.provide(self.app.client_manager, node_uuids=[]) + baremetal.provide(node_uuids=[]) def test_introspect_success(self): baremetal.introspect(self.app.client_manager, node_uuids=[], diff --git a/tripleoclient/v1/overcloud_node.py b/tripleoclient/v1/overcloud_node.py index 2a7a360b2..527a9e380 100644 --- a/tripleoclient/v1/overcloud_node.py +++ b/tripleoclient/v1/overcloud_node.py @@ -220,10 +220,13 @@ class ProvideNode(command.Command): self.log.debug("take_action(%s)" % parsed_args) if parsed_args.node_uuids: - baremetal.provide(self.app.client_manager, - node_uuids=parsed_args.node_uuids) + baremetal.provide(node_uuids=parsed_args.node_uuids, + verbosity=oooutils.playbook_verbosity(self)) + else: - baremetal.provide_manageable_nodes(self.app.client_manager) + baremetal.provide_manageable_nodes( + self.app.client_manager, + verbosity=oooutils.playbook_verbosity(self)) class CleanNode(command.Command): @@ -268,9 +271,8 @@ class CleanNode(command.Command): if parsed_args.provide: if nodes: - baremetal.provide(self.app.client_manager, - node_uuids=nodes, - ) + baremetal.provide(node_uuids=nodes, + verbosity=oooutils.playbook_verbosity(self)) else: baremetal.provide_manageable_nodes(self.app.client_manager) @@ -455,9 +457,9 @@ class DiscoverNode(command.Command): ) if parsed_args.provide: - baremetal.provide(self.app.client_manager, - node_uuids=nodes_uuids - ) + baremetal.provide( + node_uuids=nodes_uuids, + verbosity=oooutils.playbook_verbosity(self)) class ExtractProvisionedNode(command.Command): diff --git a/tripleoclient/v2/overcloud_node.py b/tripleoclient/v2/overcloud_node.py index a2ea8bd3f..48c283d2b 100644 --- a/tripleoclient/v2/overcloud_node.py +++ b/tripleoclient/v2/overcloud_node.py @@ -211,8 +211,8 @@ class IntrospectNode(command.Command): if parsed_args.provide: if parsed_args.node_uuids: baremetal.provide( - self.app.client_manager, node_uuids=parsed_args.node_uuids, + verbosity=oooutils.playbook_verbosity(self=self) ) else: baremetal.provide_manageable_nodes( diff --git a/tripleoclient/workflows/baremetal.py b/tripleoclient/workflows/baremetal.py index 1701311ab..d8b51e363 100644 --- a/tripleoclient/workflows/baremetal.py +++ b/tripleoclient/workflows/baremetal.py @@ -108,15 +108,15 @@ def register_or_update(clients, nodes_json, kernel_name=None, return registered_nodes -def provide(verbosity, node_uuids): +def provide(node_uuids, verbosity=0): """Provide Baremetal Nodes - :param verbosity: Verbosity level - :type verbosity: Integer - :param node_uuids: List of instance UUID(s). :type node_uuids: List - """ + + :param verbosity: Verbosity level + :type verbosity: Integer + """ with utils.TempDirs() as tmp: utils.run_ansible_playbook( @@ -144,11 +144,11 @@ def provide_manageable_nodes(clients, verbosity=0): """ provide( - verbosity=verbosity, node_uuids=[ i.uuid for i in clients.baremetal.node.list() if i.provision_state == "manageable" and not i.maintenance - ] + ], + verbosity=verbosity )