merge from master at 0.7.7-17-g40a2f62

8 files changed, 127 insertions, 34 deletions

diff --git a/cloudinit/atomic_helper.py b/cloudinit/atomic_helper.py
index 15319f71..a3cfd942 100644
--- a/cloudinit/atomic_helper.py
+++ b/cloudinit/atomic_helper.py
@@ -5,21 +5,27 @@ import json
 import os
 import tempfile
 
+_DEF_PERMS = 0o644
 
-def atomic_write_file(path, content, mode='w'):
+
+def write_file(filename, content, mode=_DEF_PERMS, omode="wb"):
+    # open filename in mode 'omode', write content, set permissions to 'mode'
     tf = None
     try:
-        tf = tempfile.NamedTemporaryFile(dir=os.path.dirname(path),
-                                         delete=False, mode=mode)
+        tf = tempfile.NamedTemporaryFile(dir=os.path.dirname(filename),
+                                         delete=False, mode=omode)
         tf.write(content)
         tf.close()
-        os.rename(tf.name, path)
+        os.chmod(tf.name, mode)
+        os.rename(tf.name, filename)
     except Exception as e:
         if tf is not None:
             os.unlink(tf.name)
         raise e
 
 
-def atomic_write_json(path, data):
-    return atomic_write_file(path, json.dumps(data, indent=1,
-                                              sort_keys=True) + "\n")
+def write_json(filename, data, mode=_DEF_PERMS):
+    # dump json representation of data to file filename.
+    return write_file(
+        filename, json.dumps(data, indent=1, sort_keys=True) + "\n",
+        omode="w", mode=mode)
diff --git a/cloudinit/cmd/main.py b/cloudinit/cmd/main.py
index ba22b168..83eb02c9 100644
--- a/cloudinit/cmd/main.py
+++ b/cloudinit/cmd/main.py
@@ -46,7 +46,7 @@ from cloudinit.reporting import events
 from cloudinit.settings import (PER_INSTANCE, PER_ALWAYS, PER_ONCE,
                                 CLOUD_CONFIG)
 
-from cloudinit.atomic_helper import atomic_write_json
+from cloudinit import atomic_helper
 
 from cloudinit.dhclient_hook import LogDhclient
 
@@ -513,7 +513,7 @@ def status_wrapper(name, args, data_d=None, link_d=None):
     v1['stage'] = mode
     v1[mode]['start'] = time.time()
 
-    atomic_write_json(status_path, status)
+    atomic_helper.write_json(status_path, status)
     util.sym_link(os.path.relpath(status_path, link_d), status_link,
                   force=True)
 
@@ -536,7 +536,7 @@ def status_wrapper(name, args, data_d=None, link_d=None):
     v1[mode]['finished'] = time.time()
     v1['stage'] = None
 
-    atomic_write_json(status_path, status)
+    atomic_helper.write_json(status_path, status)
 
     if mode == "modules-final":
         # write the 'finished' file
@@ -545,9 +545,9 @@ def status_wrapper(name, args, data_d=None, link_d=None):
             if v1[m]['errors']:
                 errors.extend(v1[m].get('errors', []))
 
-        atomic_write_json(result_path,
-                          {'v1': {'datasource': v1['datasource'],
-                                  'errors': errors}})
+        atomic_helper.write_json(
+            result_path, {'v1': {'datasource': v1['datasource'],
+                          'errors': errors}})
         util.sym_link(os.path.relpath(result_path, link_d), result_link,
                       force=True)
 
diff --git a/cloudinit/dhclient_hook.py b/cloudinit/dhclient_hook.py
index 9dcbe39c..82cb1855 100644
--- a/cloudinit/dhclient_hook.py
+++ b/cloudinit/dhclient_hook.py
@@ -3,7 +3,7 @@
 
 import os
 
-from cloudinit.atomic_helper import atomic_write_json
+from cloudinit import atomic_helper
 from cloudinit import log as logging
 from cloudinit import stages
 
@@ -46,5 +46,5 @@ class LogDhclient(object):
         envs = os.environ
         if self.hook_file is None:
             return
-        atomic_write_json(self.hook_file, self.get_vals(envs))
+        atomic_helper.write_json(self.hook_file, self.get_vals(envs))
         LOG.debug("Wrote dhclient options in %s", self.hook_file)
diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
index 6267dd6e..1865dc69 100644
--- a/cloudinit/distros/gentoo.py
+++ b/cloudinit/distros/gentoo.py
@@ -1,8 +1,10 @@
 # vi: ts=4 expandtab
 #
 #    Copyright (C) 2014 Rackspace, US Inc.
+#    Copyright (C) 2016 Matthew Thode.
 #
 #    Author: Nate House <nathan.house@rackspace.com>
+#    Author: Matthew Thode <prometheanfire@gentoo.org>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License version 3, as
@@ -21,6 +23,7 @@ from cloudinit import helpers
 from cloudinit import log as logging
 from cloudinit import util
 
+from cloudinit.distros import net_util
 from cloudinit.distros.parsers.hostname import HostnameConf
 
 from cloudinit.settings import PER_INSTANCE
@@ -29,9 +32,11 @@ LOG = logging.getLogger(__name__)
 
 
 class Distro(distros.Distro):
-    locale_conf_fn = "/etc/locale.gen"
-    network_conf_fn = "/etc/conf.d/net"
-    init_cmd = ['']  # init scripts
+    locale_conf_fn = '/etc/locale.gen'
+    network_conf_fn = '/etc/conf.d/net'
+    resolve_conf_fn = '/etc/resolv.conf'
+    hostname_conf_fn = '/etc/conf.d/hostname'
+    init_cmd = ['service']  # init scripts
 
     def __init__(self, name, cfg, paths):
         distros.Distro.__init__(self, name, cfg, paths)
@@ -50,7 +55,7 @@ class Distro(distros.Distro):
         # "" provides trailing newline during join
         lines = [
             util.make_header(),
-            'LANG="%s"' % (locale),
+            'LANG="%s"' % locale,
             "",
         ]
         util.write_file(out_fn, "\n".join(lines))
@@ -60,8 +65,66 @@ class Distro(distros.Distro):
         self.package_command('', pkgs=pkglist)
 
     def _write_network(self, settings):
-        util.write_file(self.network_conf_fn, settings)
-        return ['all']
+        entries = net_util.translate_network(settings)
+        LOG.debug("Translated ubuntu style network settings %s into %s",
+                  settings, entries)
+        dev_names = entries.keys()
+        nameservers = []
+
+        for (dev, info) in entries.items():
+            if 'dns-nameservers' in info:
+                nameservers.extend(info['dns-nameservers'])
+            if dev == 'lo':
+                continue
+            net_fn = self.network_conf_fn + '.' + dev
+            dns_nameservers = info.get('dns-nameservers')
+            if isinstance(dns_nameservers, (list, tuple)):
+                dns_nameservers = str(tuple(dns_nameservers)).replace(',', '')
+            # eth0, {'auto': True, 'ipv6': {}, 'bootproto': 'dhcp'}
+            # lo, {'dns-nameservers': ['10.0.1.3'], 'ipv6': {}, 'auto': True}
+            results = ''
+            if info.get('bootproto') == 'dhcp':
+                results += 'config_{name}="dhcp"'.format(name=dev)
+            else:
+                results += (
+                    'config_{name}="{ip_address} netmask {netmask}"\n'
+                    'mac_{name}="{hwaddr}"\n'
+                ).format(name=dev, ip_address=info.get('address'),
+                         netmask=info.get('netmask'),
+                         hwaddr=info.get('hwaddress'))
+                results += 'routes_{name}="default via {gateway}"\n'.format(
+                    name=dev,
+                    gateway=info.get('gateway')
+                )
+            if info.get('dns-nameservers'):
+                results += 'dns_servers_{name}="{dnsservers}"\n'.format(
+                    name=dev,
+                    dnsservers=dns_nameservers)
+            util.write_file(net_fn, results)
+            self._create_network_symlink(dev)
+            if info.get('auto'):
+                cmd = ['rc-update', 'add', 'net.{name}'.format(name=dev),
+                       'default']
+                try:
+                    (_out, err) = util.subp(cmd)
+                    if len(err):
+                        LOG.warn("Running %s resulted in stderr output: %s",
+                                 cmd, err)
+                except util.ProcessExecutionError:
+                    util.logexc(LOG, "Running interface command %s failed",
+                                cmd)
+
+        if nameservers:
+            util.write_file(self.resolve_conf_fn,
+                            convert_resolv_conf(nameservers))
+
+        return dev_names
+
+    @staticmethod
+    def _create_network_symlink(interface_name):
+        file_path = '/etc/init.d/net.{name}'.format(name=interface_name)
+        if not util.is_link(file_path):
+            util.sym_link('/etc/init.d/net.lo', file_path)
 
     def _bring_up_interface(self, device_name):
         cmd = ['/etc/init.d/net.%s' % device_name, 'restart']
@@ -108,13 +171,16 @@ class Distro(distros.Distro):
         if not conf:
             conf = HostnameConf('')
         conf.set_hostname(your_hostname)
-        util.write_file(out_fn, conf, 0o644)
+        gentoo_hostname_config = 'hostname="%s"' % conf
+        gentoo_hostname_config = gentoo_hostname_config.replace('\n', '')
+        util.write_file(out_fn, gentoo_hostname_config, 0o644)
 
     def _read_system_hostname(self):
         sys_hostname = self._read_hostname(self.hostname_conf_fn)
-        return (self.hostname_conf_fn, sys_hostname)
+        return self.hostname_conf_fn, sys_hostname
 
-    def _read_hostname_conf(self, filename):
+    @staticmethod
+    def _read_hostname_conf(filename):
         conf = HostnameConf(util.load_file(filename))
         conf.parse()
         return conf
@@ -137,7 +203,7 @@ class Distro(distros.Distro):
         if pkgs is None:
             pkgs = []
 
-        cmd = ['emerge']
+        cmd = list('emerge')
         # Redirect output
         cmd.append("--quiet")
 
@@ -158,3 +224,12 @@ class Distro(distros.Distro):
     def update_package_sources(self):
         self._runner.run("update-sources", self.package_command,
                          ["-u", "world"], freq=PER_INSTANCE)
+
+
+def convert_resolv_conf(settings):
+    """Returns a settings string formatted for resolv.conf."""
+    result = ''
+    if isinstance(settings, list):
+        for ns in settings:
+            result += 'nameserver %s\n' % ns
+    return result
diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
index 21cc602b..7e58bfea 100644
--- a/cloudinit/net/__init__.py
+++ b/cloudinit/net/__init__.py
@@ -36,7 +36,7 @@ def read_sys_net(devname, path, translate=None, enoent=None, keyerror=None):
     try:
         contents = util.load_file(sys_dev_path(devname, path))
     except (OSError, IOError) as e:
-        if getattr(e, 'errno', None) == errno.ENOENT:
+        if getattr(e, 'errno', None) in (errno.ENOENT, errno.ENOTDIR):
             if enoent is not None:
                 return enoent
         raise
@@ -347,7 +347,12 @@ def _rename_interfaces(renames, strict_present=True, strict_busy=True,
 
 def get_interface_mac(ifname):
     """Returns the string value of an interface's MAC Address"""
-    return read_sys_net(ifname, "address", enoent=False)
+    path = "address"
+    if os.path.isdir(sys_dev_path(ifname, "bonding_slave")):
+        # for a bond slave, get the nic's hwaddress, not the address it
+        # is using because its part of a bond.
+        path = "bonding_slave/perm_hwaddr"
+    return read_sys_net(ifname, path, enoent=False)
 
 
 def get_interfaces_by_mac(devs=None):
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
index a251fe01..dbc2bb68 100644
--- a/cloudinit/sources/DataSourceAzure.py
+++ b/cloudinit/sources/DataSourceAzure.py
@@ -54,6 +54,7 @@ BUILTIN_DS_CONFIG = {
         'hostname_command': 'hostname',
     },
     'disk_aliases': {'ephemeral0': '/dev/sdb'},
+    'dhclient_lease_file': '/var/lib/dhcp/dhclient.eth0.leases',
 }
 
 BUILTIN_CLOUD_CONFIG = {
@@ -106,8 +107,6 @@ def temporary_hostname(temp_hostname, cfg, hostname_command='hostname'):
 
 
 class DataSourceAzureNet(sources.DataSource):
-    FALLBACK_LEASE = '/var/lib/dhcp/dhclient.eth0.leases'
-
     def __init__(self, sys_cfg, distro, paths):
         sources.DataSource.__init__(self, sys_cfg, distro, paths)
         self.seed_dir = os.path.join(paths.seed_dir, 'azure')
@@ -116,8 +115,7 @@ class DataSourceAzureNet(sources.DataSource):
         self.ds_cfg = util.mergemanydict([
             util.get_cfg_by_path(sys_cfg, DS_CFG_PATH, {}),
             BUILTIN_DS_CONFIG])
-        self.dhclient_lease_file = self.paths.cfgs.get('dhclient_lease',
-                                                       self.FALLBACK_LEASE)
+        self.dhclient_lease_file = self.ds_cfg.get('dhclient_lease_file')
 
     def __str__(self):
         root = sources.DataSource.__str__(self)
@@ -126,6 +124,9 @@ class DataSourceAzureNet(sources.DataSource):
     def get_metadata_from_agent(self):
         temp_hostname = self.metadata.get('local-hostname')
         hostname_command = self.ds_cfg['hostname_bounce']['hostname_command']
+        agent_cmd = self.ds_cfg['agent_command']
+        LOG.debug("Getting metadata via agent.  hostname=%s cmd=%s",
+                  temp_hostname, agent_cmd)
         with temporary_hostname(temp_hostname, self.ds_cfg,
                                 hostname_command=hostname_command) \
                 as previous_hostname:
@@ -141,7 +142,7 @@ class DataSourceAzureNet(sources.DataSource):
                     util.logexc(LOG, "handling set_hostname failed")
 
             try:
-                invoke_agent(self.ds_cfg['agent_command'])
+                invoke_agent(agent_cmd)
             except util.ProcessExecutionError:
                 # claim the datasource even if the command failed
                 util.logexc(LOG, "agent command '%s' failed.",
@@ -234,13 +235,13 @@ class DataSourceAzureNet(sources.DataSource):
                                     dhclient_lease_file)
         else:
             metadata_func = self.get_metadata_from_agent
+
         try:
             fabric_data = metadata_func()
         except Exception as exc:
             LOG.info("Error communicating with Azure fabric; assume we aren't"
                      " on Azure.", exc_info=True)
             return False
-
         self.metadata['instance-id'] = util.read_dmi_data('system-uuid')
         self.metadata.update(fabric_data)
 
diff --git a/cloudinit/sources/helpers/azure.py b/cloudinit/sources/helpers/azure.py
index 6e43440f..689ed4cc 100644
--- a/cloudinit/sources/helpers/azure.py
+++ b/cloudinit/sources/helpers/azure.py
@@ -190,7 +190,8 @@ class WALinuxAgentShim(object):
         '</Health>'])
 
     def __init__(self, fallback_lease_file=None):
-        LOG.debug('WALinuxAgentShim instantiated...')
+        LOG.debug('WALinuxAgentShim instantiated, fallback_lease_file=%s',
+                  fallback_lease_file)
         self.dhcpoptions = None
         self._endpoint = None
         self.openssl_manager = None
diff --git a/cloudinit/util.py b/cloudinit/util.py
index db80ca96..9c89de61 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -1639,6 +1639,11 @@ def get_builtin_cfg():
     return obj_copy.deepcopy(CFG_BUILTIN)
 
 
+def is_link(path):
+    LOG.debug("Testing if a link exists for %s", path)
+    return os.path.islink(path)
+
+
 def sym_link(source, link, force=False):
     LOG.debug("Creating symbolic link from %r => %r", link, source)
     if force and os.path.exists(link):