diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-11-09 14:37:21 -0800 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-11-09 14:37:21 -0800 |
| commit | a0f5926d6a238a71f96c6d5ddd617b5a3f78af46 (patch) | |
| tree | a26a5996b7e1deb404097c60216c979858b12969 /cloudinit/distros/debian.py | |
| parent | 2199cf29b48f3f9789ce108951121ac6e55c5d4c (diff) | |
| parent | bd01f3466e10ca515a8e8aec42d00201f40cbd53 (diff) | |
| download | vyos-cloud-init-a0f5926d6a238a71f96c6d5ddd617b5a3f78af46.tar.gz vyos-cloud-init-a0f5926d6a238a71f96c6d5ddd617b5a3f78af46.zip | |
Fix the fqdn/hostname case for rhel and ubuntu
where rhel uses the fqdn for its config while
ubuntu uses the short hostname.
Diffstat (limited to 'cloudinit/distros/debian.py')
| -rw-r--r-- | cloudinit/distros/debian.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py index cc7e53a0..ed4070b4 100644 --- a/cloudinit/distros/debian.py +++ b/cloudinit/distros/debian.py @@ -67,7 +67,7 @@ class Distro(distros.Distro): else: return distros.Distro._bring_up_interfaces(self, device_names) - def set_hostname(self, hostname): + def set_hostname(self, hostname, fqdn=None): self._write_hostname(hostname, "/etc/hostname") LOG.debug("Setting hostname to %s", hostname) util.subp(['hostname', hostname]) @@ -76,7 +76,7 @@ class Distro(distros.Distro): # "" gives trailing newline. util.write_file(out_fn, "%s\n" % str(hostname), 0644) - def update_hostname(self, hostname, prev_fn): + def update_hostname(self, hostname, fqdn, prev_fn): hostname_prev = self._read_hostname(prev_fn) hostname_in_etc = self._read_hostname("/etc/hostname") update_files = [] |