summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-10-07 12:35:01 -0400
committerScott Moser <smoser@ubuntu.com>2013-10-07 12:35:01 -0400
commit4a5d0f589461fc933b9449660d6d6cf6fa40bff2 (patch)
treeb0653d6ee4ba019b4c359041335e176f9d2b8a92
parent12f2fbf8588af097c3922d4398d59124687d6ded (diff)
parentc99f4e6fdf33bb0d2688d427514cb42821e8febb (diff)
downloadvyos-cloud-init-4a5d0f589461fc933b9449660d6d6cf6fa40bff2.tar.gz
vyos-cloud-init-4a5d0f589461fc933b9449660d6d6cf6fa40bff2.zip
trim trailing whitespace on smartos hostname when it came from dmidecode.
LP: #1236445
-rw-r--r--cloudinit/sources/DataSourceSmartOS.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceSmartOS.py b/cloudinit/sources/DataSourceSmartOS.py
index ba7e6acc..2b4386b7 100644
--- a/cloudinit/sources/DataSourceSmartOS.py
+++ b/cloudinit/sources/DataSourceSmartOS.py
@@ -274,7 +274,7 @@ def dmi_data():
except Exception as e:
util.logexc(LOG, "Failed to get system UUID", e)
- return sys_uuid.lower(), sys_type
+ return (sys_uuid.lower().strip(), sys_type.strip())
# Used to match classes to dependencies