openstack/openstack-ansible
Code Issues Proposed changes

Merge "Fix KeyError raised when max hostname length exceeded"

Browse Source
This commit is contained in:
Zuul 2020-07-10 09:58:42 +00:00 committed by Gerrit Code Review
commit 8fa414e1f8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osa_toolkit/generate.py
View File

@ -370,8 +370,8 @@ def _add_container_hosts(assignment, config, container_name, container_type,
type_and_name = '{}_{}'.format(host_type, container_name)
logger.debug("Generated container name %s", type_and_name)
max_hostname_len = 52
if len(type_and_name) > max_hostname_len and \
not properties['is_metal']:
is_metal = properties.get('is_metal', False)
if len(type_and_name) > max_hostname_len and not is_metal:
raise SystemExit(
'The resulting combination of [ "{}" + "{}" ] is longer than'
' {} characters. This combination will result in a container'
@ -383,7 +383,7 @@ def _add_container_hosts(assignment, config, container_name, container_type,
host_type, container_name, max_hostname_len
)
)
elif len(host_type) > 63 and properties['is_metal']:
elif len(host_type) > 63 and is_metal:
raise SystemExit(
'The resulting hostname "{0}" is longer than 63 characters.'
' This combination may result in a name that is longer than'