diff options
| author | Scott Moser <smoser@ubuntu.com> | 2011-09-01 11:07:28 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2011-09-01 11:07:28 -0400 |
| commit | db2db4a5b20b5e3cf7f4bd7efa92c0f0062311a3 (patch) | |
| tree | a8f6bf8215785337fd770a10b633fcc9270bfc64 | |
| parent | 3197810f17e3267e9147d0572079d8133d9f61e4 (diff) | |
| download | vyos-cloud-init-db2db4a5b20b5e3cf7f4bd7efa92c0f0062311a3.tar.gz vyos-cloud-init-db2db4a5b20b5e3cf7f4bd7efa92c0f0062311a3.zip | |
DataSourceOVF do not provide a default static hostname
This is the same change made in DataSourceNoCloud, but to the
OVF DataSource.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | cloudinit/DataSourceOVF.py | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -48,6 +48,10 @@ rather than appending. This ensures that the authorized_keys that are being inserted actually do something (LP: #434076, LP: #833499) - log warning on failure to set hostname (LP: #832175) + - upstart/cloud-init-nonet.conf: wait for all network interfaces to be up + - DataSourceNoCloud, DataSourceOVF : do not provide a default hostname. + This way the configured hostname of the system will be used if not provided + by metadata (LP: #838280) 0.6.1: - fix bug in fixing permission on /var/log/cloud-init.log (LP: #704509) diff --git a/cloudinit/DataSourceOVF.py b/cloudinit/DataSourceOVF.py index 04fa8da8..0159eed7 100644 --- a/cloudinit/DataSourceOVF.py +++ b/cloudinit/DataSourceOVF.py @@ -51,7 +51,6 @@ class DataSourceOVF(DataSource.DataSource): ud = "" defaults = { - "local-hostname" : "ubuntuhost", "instance-id" : "nocloud" } @@ -109,9 +108,6 @@ class DataSourceOVF(DataSource.DataSource): if not 'public-keys' in self.metadata: return([]) return([self.metadata['public-keys'],]) - def get_hostname(self): - return(self.metadata['local-hostname']) - # the data sources' config_obj is a cloud-config formated # object that came to it from ways other than cloud-config # because cloud-config content would be handled elsewhere |