diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-01-16 14:29:48 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-01-16 14:29:48 -0500 |
| commit | 8d453d2a4da4492857a4487b14fe7b11a014115b (patch) | |
| tree | f076768503899a7554be574e34d9c2220c8d8432 /cloudinit/distros/sles.py | |
| parent | ae2f5123faab45e71e4dcf3237d7dac59a4c66b7 (diff) | |
| download | vyos-cloud-init-8d453d2a4da4492857a4487b14fe7b11a014115b.tar.gz vyos-cloud-init-8d453d2a4da4492857a4487b14fe7b11a014115b.zip | |
hostname: apply hostname same as is written
on RHEL, we were writing to persistent configuration the fqdn, but
invoking 'hostname' on the first boot with just the shortname. On 'reboot',
then the hostname would differ.
Now, whatever we write, invoke hostname with.
Also remove some duplicate code.
LP: #1246485
Diffstat (limited to 'cloudinit/distros/sles.py')
| -rw-r--r-- | cloudinit/distros/sles.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/cloudinit/distros/sles.py b/cloudinit/distros/sles.py index 9788a1ba..43682a12 100644 --- a/cloudinit/distros/sles.py +++ b/cloudinit/distros/sles.py @@ -115,13 +115,6 @@ class Distro(distros.Distro): conf.set_hostname(hostname) util.write_file(out_fn, str(conf), 0644) - def _select_hostname(self, hostname, fqdn): - # Prefer the short hostname over the long - # fully qualified domain name - if not hostname: - return fqdn - return hostname - def _read_system_hostname(self): host_fn = self.hostname_conf_fn return (host_fn, self._read_hostname(host_fn)) |