1 files changed, 9 insertions, 71 deletions
diff --git a/cloudinit/transforms/cc_update_hostname.py b/cloudinit/transforms/cc_update_hostname.py
index b9d1919a..439bdcb3 100644
--- a/cloudinit/transforms/cc_update_hostname.py
+++ b/cloudinit/transforms/cc_update_hostname.py
@@ -18,84 +18,22 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import cloudinit.util as util
-import subprocess
-import errno
-from cloudinit.CloudConfig import per_always
+from cloudinit import util
+from cloudinit.settings import PER_ALWAYS
 
-frequency = per_always
+frequency = PER_ALWAYS
 
 
-def handle(_name, cfg, cloud, log, _args):
+def handle(name, cfg, cloud, log, _args):
     if util.get_cfg_option_bool(cfg, "preserve_hostname", False):
-        log.debug("preserve_hostname is set. not updating hostname")
+        log.debug(("Configuration option 'preserve_hostname' is set,"
+                    " not updating the hostname in %s"), name)
         return
 
     (hostname, _fqdn) = util.get_hostname_fqdn(cfg, cloud)
     try:
-        prev = "%s/%s" % (cloud.get_cpath('data'), "previous-hostname")
-        update_hostname(hostname, prev, log)
+        prev_fn = os.path.join(cloud.get_cpath('data'), "previous-hostname")
+        cloud.distro.update_hostname(hostname, prev_fn)
     except Exception:
-        log.warn("failed to set hostname\n")
+        util.logexc(log, "Failed to set the hostname to %s", hostname)
         raise
-
-
-# read hostname from a 'hostname' file
-# allow for comments and stripping line endings.
-# if file doesn't exist, or no contents, return default
-def read_hostname(filename, default=None):
-    try:
-        fp = open(filename, "r")
-        lines = fp.readlines()
-        fp.close()
-        for line in lines:
-            hpos = line.find("#")
-            if hpos != -1:
-                line = line[0:hpos]
-            line = line.rstrip()
-            if line:
-                return line
-    except IOError as e:
-        if e.errno != errno.ENOENT:
-            raise
-    return default
-
-
-def update_hostname(hostname, prev_file, log):
-    etc_file = "/etc/hostname"
-
-    hostname_prev = None
-    hostname_in_etc = None
-
-    try:
-        hostname_prev = read_hostname(prev_file)
-    except Exception as e:
-        log.warn("Failed to open %s: %s" % (prev_file, e))
-
-    try:
-        hostname_in_etc = read_hostname(etc_file)
-    except:
-        log.warn("Failed to open %s" % etc_file)
-
-    update_files = []
-    if not hostname_prev or hostname_prev != hostname:
-        update_files.append(prev_file)
-
-    if (not hostname_in_etc or
-        (hostname_in_etc == hostname_prev and hostname_in_etc != hostname)):
-        update_files.append(etc_file)
-
-    try:
-        for fname in update_files:
-            util.write_file(fname, "%s\n" % hostname, 0644)
-            log.debug("wrote %s to %s" % (hostname, fname))
-    except:
-        log.warn("failed to write hostname to %s" % fname)
-
-    if hostname_in_etc and hostname_prev and hostname_in_etc != hostname_prev:
-        log.debug("%s differs from %s. assuming user maintained" %
-                  (prev_file, etc_file))
-
-    if etc_file in update_files:
-        log.debug("setting hostname to %s" % hostname)
-        subprocess.Popen(['hostname', hostname]).communicate()