Merge ~larsks/cloud-init:bug/1647910 into cloud-init:master

[Lars Kellogg-Stedman]

If no data source is available and the local hostname is set to "localhost.localdomain", and /etc/hosts looks like:

  127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4

Then in sources/__init__.py in get_hostname:

- util.get_hostname() will return 'localhost.localdomain'
- util.get_fqdn_from_hosts(hostname) will return 'localhost'
- 'toks' will be set to [ 'localhost.localdomain', 'localdomain'

And ultimately the system hostname will be set to 'localhost.localdomain.localdomain', which isn't useful to anybody.

[Scott Moser (smoser)]

one question inline

diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py
index 13fb7c6..ea05c4d 100644
--- a/cloudinit/sources/__init__.py
+++ b/cloudinit/sources/__init__.py
@@ -194,6 +194,8 @@ class DataSource(object):
             fqdn = util.get_fqdn_from_hosts(hostname)
             if fqdn and fqdn.find(".") > 0:
                 toks = str(fqdn).split(".")
+            elif hostname and hostname.find(".") > 0:
+                toks = str(hostname).split(".")
             elif hostname:
                 toks = [hostname, defdomain]
             else: