x/cloud-init
Code Issues Proposed changes

Update how errors are handled when writing and reading hostnames.

Browse Source
This commit is contained in:
Joshua Harlow 2012-11-13 15:24:53 -08:00
parent ac30d6bac4
commit f280dc43d6
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cloudinit/distros/debian.py
View File

@ -88,37 +88,37 @@ class Distro(distros.Distro):
return hostname return hostname
def _write_hostname(self, your_hostname, out_fn): def _write_hostname(self, your_hostname, out_fn):
conf = None
try:
# Try to update the previous one
# so lets see if we can read it first.
conf = self._read_hostname_conf(out_fn) conf = self._read_hostname_conf(out_fn)
except IOError:
pass
if not conf: if not conf:
conf = HostnameConf('') conf = HostnameConf('')
conf.parse()
conf.set_hostname(your_hostname) conf.set_hostname(your_hostname)
util.write_file(out_fn, str(conf), 0644) util.write_file(out_fn, str(conf), 0644)
def _read_system_hostname(self): def _read_system_hostname(self):
conf = self._read_hostname_conf(self.hostname_conf_fn) sys_hostname = self._read_hostname(self.hostname_conf_fn)
if conf:
sys_hostname = conf.hostname
else:
sys_hostname = None
return (self.hostname_conf_fn, sys_hostname) return (self.hostname_conf_fn, sys_hostname)
def _read_hostname_conf(self, filename): def _read_hostname_conf(self, filename):
try:
conf = HostnameConf(util.load_file(filename)) conf = HostnameConf(util.load_file(filename))
conf.parse() conf.parse()
return conf return conf
except IOError:
util.logexc(LOG, "Error reading hostname from %s", filename)
return None
def _read_hostname(self, filename, default=None): def _read_hostname(self, filename, default=None):
hostname = None
try:
conf = self._read_hostname_conf(filename) conf = self._read_hostname_conf(filename)
if not conf: hostname = conf.hostname
except IOError:
pass
if not hostname:
return default return default
if not conf.hostname: return hostname
return default
return conf.hostname
def _get_localhost_ip(self): def _get_localhost_ip(self):
# Note: http://www.leonardoborda.com/blog/127-0-1-1-ubuntu-debian/ # Note: http://www.leonardoborda.com/blog/127-0-1-1-ubuntu-debian/