Browse Source

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
changes/27/821327/1
Harald Jensås 8 months ago
parent
commit
ddfd6d9940
  1. 2
      tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py
  2. 1
      tripleoclient/v1/overcloud_node.py

2
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'},

1
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,

Loading…
Cancel
Save