openstack/placement
Code Issues Proposed changes

Merge "Reorder name normalization for DNS"

Browse Source
This commit is contained in:
Jenkins
2016-02-15 19:30:47 +00:00
committed by Gerrit Code Review
parent ec04b2a3ad aed56e2b27
commit 78c2af13bc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/utils.py
View File

@@ -802,6 +802,7 @@ def sanitize_hostname(hostname, default_name=None):
if six.PY3: if six.PY3:
hostname = hostname.decode('latin-1') hostname = hostname.decode('latin-1')
hostname = truncate_hostname(hostname)
hostname = re.sub('[ _]', '-', hostname) hostname = re.sub('[ _]', '-', hostname)
hostname = re.sub('[^\w.-]+', '', hostname) hostname = re.sub('[^\w.-]+', '', hostname)
hostname = hostname.lower() hostname = hostname.lower()
@@ -810,8 +811,7 @@ def sanitize_hostname(hostname, default_name=None):
# empty hostname # empty hostname
if hostname == "" and default_name is not None: if hostname == "" and default_name is not None:
return truncate_hostname(default_name) return truncate_hostname(default_name)
return hostname
return truncate_hostname(hostname)
@contextlib.contextmanager @contextlib.contextmanager