openstack
/
tripleo-common
Code Issues Proposed changes

Don't use tripleo_hostname tag 

The tags field in neutron has a max length of
60 characters. A hostname can be longer, and in
the case it is longer adding the tag will cause
a "Invalid input exceeds maximum length of 60"
error will be raised.

Use the 'dns_name' field instead of the custom tag.

Related-Bug: #1921713
Change-Id: I4b0b90d196bed2025e2111a813d0c0dfa1c7fedc
This commit is contained in:
Harald Jensås 2021-03-29 16:43:34 +02:00
parent 4d36ee9dd9
commit 08addb9489
3 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleo_common/inventory.py
View File

@ -127,7 +127,7 @@ class NeutronData(object):
return tag_dict
def _ports_by_role_and_host(self):
mandatory_tags = {'tripleo_role', 'tripleo_hostname'}
mandatory_tags = {'tripleo_role'}
ports_by_role_and_host = {}
for port in self.ports:
@ -137,7 +137,7 @@ class NeutronData(object):
if not mandatory_tags.issubset(tags):
raise exception.MissingMandatoryNeutronResourceTag()
hostname = tags['tripleo_hostname']
hostname = port.dns_name
network_id = port.network_id
network = self.networks_by_id[network_id]
fixed_ips = port.fixed_ips[0]

36
tripleo_common/tests/fake_neutron/fakes.py
View File

@ -68,8 +68,8 @@ controller0_ports = [
network_id=ctlplane_network.id,
fixed_ips=[dict(ip_address='192.0.2.10',
subnet_id=ctlplane_subnet.id)],
tags=['tripleo_hostname=c-0',
'tripleo_network_name=ctlplane',
dns_name='c-0',
tags=['tripleo_network_name=ctlplane',
'tripleo_role=Controller',
'tripleo_stack=overcloud',
'tripleo_default_route=True'],
@ -79,8 +79,8 @@ controller0_ports = [
network_id=internal_api_network.id,
fixed_ips=[dict(ip_address='198.51.100.140',
subnet_id=internal_api_subnet.id)],
tags=['tripleo_hostname=c-0',
'tripleo_network_name=InternalApi',
dns_name='c-0',
tags=['tripleo_network_name=InternalApi',
'tripleo_role=Controller',
'tripleo_stack=overcloud',
'tripleo_default_route=False'],
@ -93,8 +93,8 @@ controller1_ports = [
network_id=ctlplane_network.id,
fixed_ips=[dict(ip_address='192.0.2.11',
subnet_id=ctlplane_subnet.id)],
tags=['tripleo_hostname=c-1',
'tripleo_network_name=ctlplane',
dns_name='c-1',
tags=['tripleo_network_name=ctlplane',
'tripleo_role=Controller',
'tripleo_stack=overcloud',
'tripleo_default_route=True'],
@ -104,8 +104,8 @@ controller1_ports = [
network_id=internal_api_network.id,
fixed_ips=[dict(ip_address='198.51.100.141',
subnet_id=internal_api_subnet.id)],
tags=['tripleo_hostname=c-1',
'tripleo_network_name=InternalApi',
dns_name='c-1',
tags=['tripleo_network_name=InternalApi',
'tripleo_role=Controller',
'tripleo_stack=overcloud',
'tripleo_default_route=False'],
@ -118,8 +118,8 @@ controller2_ports = [
network_id=ctlplane_network.id,
fixed_ips=[dict(ip_address='192.0.2.12',
subnet_id=ctlplane_subnet.id)],
tags=['tripleo_hostname=c-2',
'tripleo_network_name=ctlplane',
dns_name='c-2',
tags=['tripleo_network_name=ctlplane',
'tripleo_role=Controller',
'tripleo_stack=overcloud',
'tripleo_default_route=True'],
@ -129,8 +129,8 @@ controller2_ports = [
network_id=internal_api_network.id,
fixed_ips=[dict(ip_address='198.51.100.142',
subnet_id=internal_api_subnet.id)],
tags=['tripleo_hostname=c-2',
'tripleo_network_name=InternalApi',
dns_name='c-2',
tags=['tripleo_network_name=InternalApi',
'tripleo_role=Controller',
'tripleo_stack=overcloud',
'tripleo_default_route=False'],
@ -143,8 +143,8 @@ compute_0_ports = [
network_id=ctlplane_network.id,
fixed_ips=[dict(ip_address='192.0.2.20',
subnet_id=ctlplane_subnet.id)],
tags=['tripleo_hostname=cp-0',
'tripleo_network_name=ctlplane',
dns_name='cp-0',
tags=['tripleo_network_name=ctlplane',
'tripleo_role=Compute',
'tripleo_stack=overcloud',
'tripleo_default_route=True'],
@ -154,8 +154,8 @@ compute_0_ports = [
network_id=internal_api_network.id,
fixed_ips=[dict(ip_address='198.51.100.150',
subnet_id=internal_api_subnet.id)],
tags=['tripleo_hostname=cp-0',
'tripleo_network_name=InternalApi',
dns_name='cp-0',
tags=['tripleo_network_name=InternalApi',
'tripleo_role=Compute',
'tripleo_stack=overcloud',
'tripleo_default_route=False'],
@ -169,8 +169,8 @@ custom_0_ports = [
network_id=ctlplane_network.id,
fixed_ips=[dict(ip_address='192.0.2.200',
subnet_id=ctlplane_subnet.id)],
tags=['tripleo_hostname=cs-0',
'tripleo_network_name=ctlplane',
dns_name='cs-0',
tags=['tripleo_network_name=ctlplane',
'tripleo_role=CustomRole',
'tripleo_stack=overcloud',
'tripleo_default_route=True'],

6
tripleo_common/tests/test_inventory.py
View File

@ -1342,7 +1342,6 @@ class TestNeutronData(base.TestCase):
'network_name': 'ctlplane',
'subnet_id': 'ctlplane_subnet_id',
'tags': {'tripleo_default_route': True,
'tripleo_hostname': 'c-0',
'tripleo_network_name': 'ctlplane',
'tripleo_role': 'Controller',
'tripleo_stack': 'overcloud'},
@ -1362,7 +1361,6 @@ class TestNeutronData(base.TestCase):
'network_name': 'internal_api',
'subnet_id': 'internal_api_subnet_id',
'tags': {'tripleo_default_route': False,
'tripleo_hostname': 'c-0',
'tripleo_network_name': 'InternalApi',
'tripleo_role': 'Controller',
'tripleo_stack': 'overcloud'},
@ -1385,7 +1383,6 @@ class TestNeutronData(base.TestCase):
'network_name': 'ctlplane',
'subnet_id': 'ctlplane_subnet_id',
'tags': {'tripleo_default_route': True,
'tripleo_hostname': 'c-1',
'tripleo_network_name': 'ctlplane',
'tripleo_role': 'Controller',
'tripleo_stack': 'overcloud'},
@ -1405,7 +1402,6 @@ class TestNeutronData(base.TestCase):
'network_name': 'internal_api',
'subnet_id': 'internal_api_subnet_id',
'tags': {'tripleo_default_route': False,
'tripleo_hostname': 'c-1',
'tripleo_network_name': 'InternalApi',
'tripleo_role': 'Controller',
'tripleo_stack': 'overcloud'},
@ -1428,7 +1424,6 @@ class TestNeutronData(base.TestCase):
'network_name': 'ctlplane',
'subnet_id': 'ctlplane_subnet_id',
'tags': {'tripleo_default_route': True,
'tripleo_hostname': 'cp-0',
'tripleo_network_name': 'ctlplane',
'tripleo_role': 'Compute',
'tripleo_stack': 'overcloud'},
@ -1448,7 +1443,6 @@ class TestNeutronData(base.TestCase):
'network_name': 'internal_api',
'subnet_id': 'internal_api_subnet_id',
'tags': {'tripleo_default_route': False,
'tripleo_hostname': 'cp-0',
'tripleo_network_name': 'InternalApi',
'tripleo_role': 'Compute',
'tripleo_stack': 'overcloud'},