openstack/python-tripleoclient
Code Issues Proposed changes

Do not use ironic/nova for generate_fencing

Browse Source 
This commit cleans up and simplifies the way fencing parameters
are generated.
We don't try to map baremetal nodes to instances anymore and we simply
generate fencing agents definitions for each node.

Change-Id: I362870cd1f0a78049268e5910ffef4dc9424f668
This commit is contained in:
Luca Miccini 2021-03-10 10:07:51 +01:00
parent 410ffccaf0
commit fe39c4c9f3
4 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tripleoclient/tests/v1/test_overcloud_parameters.py
View File

@ -68,7 +68,6 @@ class TestGenerateFencingParameters(utils.TestCommand):
self.cmd.take_action(parsed_args)
mock_gen_fence.assert_called_once_with(
self.app.client_manager,
**{
'nodes_json': [
{

1
tripleoclient/tests/workflows/test_parameters.py
View File

@ -154,7 +154,6 @@ class TestParameterWorkflows(utils.TestCommand):
'ipmi_lanplus': True
}
params = parameters.generate_fencing_parameters(
self.app.client_manager,
**workflow_input
)
self.assertEqual(params, {"parameter_defaults": {}})

1
tripleoclient/v1/overcloud_parameters.py
View File

@ -58,7 +58,6 @@ class GenerateFencingParameters(command.Command):
nodes_config = utils.parse_env_file(parsed_args.instackenv)
parsed_args.instackenv.close()
result = parameters.generate_fencing_parameters(
clients=self.app.client_manager,
nodes_json=nodes_config,
delay=parsed_args.delay,
ipmi_level=parsed_args.ipmi_level,

7
tripleoclient/workflows/parameters.py
View File

@ -231,13 +231,10 @@ def check_deprecated_parameters(clients, stack_name, tht_root, template,
)
def generate_fencing_parameters(clients, nodes_json, delay, ipmi_level,
def generate_fencing_parameters(nodes_json, delay, ipmi_level,
ipmi_cipher, ipmi_lanplus):
"""Generate and return fencing parameters.
:param clients: application client object.
:type clients: Object
:param nodes_json: list of nodes & attributes in json format
:type nodes_json: List
@ -256,8 +253,6 @@ def generate_fencing_parameters(clients, nodes_json, delay, ipmi_level,
:returns: Dictionary
"""
return stk_parameters.generate_fencing_parameters(
clients.baremetal,
clients.compute,
nodes_json=nodes_json,
delay=delay,
ipmi_level=ipmi_level,