openstack/openstack-ansible
Code Issues Proposed changes

Do not append container_name for metal containers

Browse Source 
dynamic_inventory.py fails in case of hostname+container_name length
is more than 52 symbols. While it's valid appriach for containers,
it shouldn't raise error when container is deployed on metal, since
nothing will be appended to it's current hostname.

Change-Id: Ifeed116a026042ae32985aaa7ff3f167ef3923f4
This commit is contained in:
Dmitriy Rabotyagov 2020-02-04 19:23:42 +02:00
parent e838031f4c
commit 2a7edfb036
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osa_toolkit/generate.py
View File

@ -370,15 +370,27 @@ def _add_container_hosts(assignment, config, container_name, container_type,
type_and_name = '{}_{}'.format(host_type, container_name) type_and_name = '{}_{}'.format(host_type, container_name)
logger.debug("Generated container name %s", type_and_name) logger.debug("Generated container name %s", type_and_name)
max_hostname_len = 52 max_hostname_len = 52
if len(type_and_name) > max_hostname_len: if len(type_and_name) > max_hostname_len and \
not properties['is_metal']:
raise SystemExit( raise SystemExit(
'The resulting combination of [ "{}" + "{}" ] is longer than' 'The resulting combination of [ "{}" + "{}" ] is longer than'
' 52 characters. This combination will result in a container' ' {} characters. This combination will result in a container'
' name that is longer than the maximum allowable hostname of' ' name that is longer than the maximum allowable hostname of'
' 63 characters. Before this process can continue please' ' 63 characters. Before this process can continue please'
' adjust the host entries in your "openstack_user_config.yml"' ' adjust the host entries in your "openstack_user_config.yml"'
' to use a short hostname. The recommended hostname length is' ' to use a short hostname. The recommended hostname length is'
' < 20 characters long.'.format(host_type, container_name) ' < 20 characters long.'.format(
host_type, container_name, max_hostname_len
)
)
elif len(host_type) > 63 and properties['is_metal']:
raise SystemExit(
'The resulting hostname "{0}" is longer than 63 characters.'
' This combination may result in a name that is longer than'
' the maximum allowable hostname of 63 characters. Before'
' this process can continue please adjust the host entries'
' in your "openstack_user_config.yml" to use a short hostname'
'.'.format(host_type)
) )
physical_host = inventory['_meta']['hostvars'][host_type] physical_host = inventory['_meta']['hostvars'][host_type]