diff options
| author | Scott Moser <smoser@brickies.net> | 2017-04-03 11:52:06 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-04-03 11:52:06 -0400 |
| commit | 3b2e493b51153cd5bc1fa91e6ac52f59d41fe3fb (patch) | |
| tree | 678b118605245e5bb1b218565728270702aba5b4 /cloudinit/sources/__init__.py | |
| parent | e018fa910fdf0dbf3aa22e59e935461babd205c4 (diff) | |
| parent | 61eb03fef92f435434d974fb46439189ef0b5f97 (diff) | |
| download | vyos-cloud-init-3b2e493b51153cd5bc1fa91e6ac52f59d41fe3fb.tar.gz vyos-cloud-init-3b2e493b51153cd5bc1fa91e6ac52f59d41fe3fb.zip | |
merge from master at 0.7.9-90-g61eb03fe
Diffstat (limited to 'cloudinit/sources/__init__.py')
| -rw-r--r-- | cloudinit/sources/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py index 3d01072f..5c99437e 100644 --- a/cloudinit/sources/__init__.py +++ b/cloudinit/sources/__init__.py @@ -50,7 +50,7 @@ class DataSource(object): self.distro = distro self.paths = paths self.userdata = None - self.metadata = None + self.metadata = {} self.userdata_raw = None self.vendordata = None self.vendordata_raw = None @@ -210,7 +210,7 @@ class DataSource(object): else: hostname = toks[0] - if fqdn: + if fqdn and domain != defdomain: return "%s.%s" % (hostname, domain) else: return hostname |