From ddfd6d99404ed4b5cb24d4b1e278283c603a23bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Thu, 9 Dec 2021 23:44:01 +0100 Subject: [PATCH] Don't set 'subnet' for ctlplane in node extract Metalsmith does not support both network and subnet key in a NIC definition. Since the ctlplane port has vif: True, the subnet to use is automated via ironic port physical_network and neutron physical_network segment mapping. Setting the subnet is not neccecary in this case. Change-Id: I8ac9fee84d1c830c0df4f34088c12aec98323dbb Closes-Bug: #1954341 --- tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py | 2 -- tripleoclient/v1/overcloud_node.py | 1 - 2 files changed, 3 deletions(-) diff --git a/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py b/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py index 5f1ab388a..78699ca47 100644 --- a/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py +++ b/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py @@ -913,7 +913,6 @@ class TestExtractProvisionedNode(test_utils.TestCommand): 'public_interface_name': 'nic1', 'template': 'templates/compute.j2'}, 'networks': [{'network': 'ctlplane', - 'subnet': 'ctlplane_b', 'vif': True}, {'network': 'internal_api', 'subnet': 'internal_api_b'}] @@ -934,7 +933,6 @@ class TestExtractProvisionedNode(test_utils.TestCommand): 'public_interface_name': 'nic1', 'template': 'templates/controller.j2'}, 'networks': [{'network': 'ctlplane', - 'subnet': 'ctlplane_a', 'vif': True}, {'network': 'external', 'subnet': 'external_a'}, diff --git a/tripleoclient/v1/overcloud_node.py b/tripleoclient/v1/overcloud_node.py index 3b603c4c6..c7214f9f0 100644 --- a/tripleoclient/v1/overcloud_node.py +++ b/tripleoclient/v1/overcloud_node.py @@ -570,7 +570,6 @@ class ExtractProvisionedNode(command.Command): ips[0]) if net_name == constants.CTLPLANE_NET_NAME: role_networks.append({'network': net_name, - 'subnet': subnet_name, 'vif': True}) else: role_networks.append({'network': net_name,