From 53f1938a1c33b4d9e333101d1d614803373a6bc5 Mon Sep 17 00:00:00 2001
From: Harm Weites <harm@weites.com>
Date: Fri, 6 Dec 2013 21:25:04 +0000
Subject: new: FreeBSD module to support cloud-init on the FBSD10 platform. In
 its current form its still missing some modules though.

Supported:
-SSH-keys
-growpart
-growfs
-adduser
-powerstate
---
 cloudinit/distros/__init__.py |   1 +
 cloudinit/distros/freebsd.py  | 208 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 209 insertions(+)
 create mode 100644 cloudinit/distros/freebsd.py

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
index 74e95797..46b67fa3 100644
--- a/cloudinit/distros/__init__.py
+++ b/cloudinit/distros/__init__.py
@@ -39,6 +39,7 @@ from cloudinit.distros.parsers import hosts
 OSFAMILIES = {
     'debian': ['debian', 'ubuntu'],
     'redhat': ['fedora', 'rhel'],
+    'freebsd': ['freebsd'],
     'suse': ['sles']
 }
 
diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py
new file mode 100644
index 00000000..2d6cd924
--- /dev/null
+++ b/cloudinit/distros/freebsd.py
@@ -0,0 +1,208 @@
+# vi: ts=4 expandtab
+#
+#    Copyright (C) 2012 Canonical Ltd.
+#    Copyright (C) 2012, 2013 Hewlett-Packard Development Company, L.P.
+#    Copyright (C) 2012 Yahoo! Inc.
+#
+#    Author: Scott Moser <scott.moser@canonical.com>
+#    Author: Juerg Haefliger <juerg.haefliger@hp.com>
+#    Author: Joshua Harlow <harlowja@yahoo-inc.com>
+#
+#    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
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from cloudinit import distros
+from cloudinit import helpers
+from cloudinit import log as logging
+from cloudinit import netinfo
+from cloudinit import ssh_util
+from cloudinit import util
+
+from cloudinit.settings import PER_INSTANCE
+
+LOG = logging.getLogger(__name__)
+
+class Distro(distros.Distro):
+    def __init__(self, name, cfg, paths):
+        distros.Distro.__init__(self, name, cfg, paths)
+        # This will be used to restrict certain
+        # calls from repeatly happening (when they
+        # should only happen say once per instance...)
+        self._runner = helpers.Runners(paths)
+        self.osfamily = 'freebsd'
+
+    def updatercconf(self, key, value):
+	LOG.debug("updatercconf: %s => %s" % (key, value))
+        conf = {}
+	configchanged = False
+	with open("/etc/rc.conf") as file:
+            for line in file:
+                tok = line.split('=')
+		# TODO: Handle keys with spaces, make this a bit more robust.
+		if tok[0] == key:
+		    if tok[1] != value:
+		        conf[tok[0]] = value 
+			LOG.debug("[rc.conf]: Value %s for key %s needs to be changed" % (value, key))
+			configchanged = True
+		else:
+		    conf[tok[0]] = tok[1].rstrip()
+
+        if configchanged:
+            LOG.debug("Writing new /etc/rc.conf file")
+            with open ('/etc/rc.conf', 'w') as file:
+               for keyval in conf.items():
+                   file.write("%s=%s\n" % keyval)
+
+    def _read_hostname():
+	return
+
+    def _read_system_hostname():
+	return
+
+    def _select_hostname(self, hostname, fqdn):
+        if not hostname:
+            return fqdn
+        return hostname
+
+    def _write_hostname(self, your_hostname, out_fn):
+       self.updatercconf('hostname', your_hostname)
+
+    def create_group(self, name, members):
+        group_add_cmd = ['pw', '-n', name]
+        if util.is_group(name):
+            LOG.warn("Skipping creation of existing group '%s'" % name)
+        else:
+            try:
+                util.subp(group_add_cmd)
+                LOG.info("Created new group %s" % name)
+            except Exception:
+                util.logexc("Failed to create group %s", name)
+
+        if len(members) > 0:
+            for member in members:
+                if not util.is_user(member):
+                    LOG.warn("Unable to add group member '%s' to group '%s'"
+                                     "; user does not exist.", member, name)
+                    continue
+                util.subp(['pw', 'usermod', '-n', name, '-G', member])
+                LOG.info("Added user '%s' to group '%s'" % (member, name))
+
+    def add_user(self, name, **kwargs):
+        if util.is_user(name):
+            LOG.info("User %s already exists, skipping." % name)
+            return False
+
+        adduser_cmd = ['pw', 'useradd', '-n', name]
+        log_adduser_cmd = ['pw', 'useradd', '-n', name]
+
+	adduser_opts = {
+		"homedir": '-d',
+		"gecos": '-c',
+		"primary_group": '-g',
+		"groups": '-G',
+		"passwd": '-h',
+		"shell": '-s',
+		"inactive": '-E',
+	}
+	adduser_flags = {
+		"no_user_group": '--no-user-group',
+		"system": '--system',
+		"no_log_init": '--no-log-init',
+	}
+
+	redact_opts = ['passwd']
+
+	for key, val in kwargs.iteritems():
+	    if key in adduser_opts and val and isinstance(val, str):
+               	adduser_cmd.extend([adduser_opts[key], val])
+
+                # Redact certain fields from the logs
+                if key in redact_opts:
+                    log_adduser_cmd.extend([adduser_opts[key], 'REDACTED'])
+                else:
+                    log_adduser_cmd.extend([adduser_opts[key], val])
+
+            elif key in adduser_flags and val:
+                adduser_cmd.append(adduser_flags[key])
+                log_adduser_cmd.append(adduser_flags[key])
+
+        if 'no_create_home' in kwargs or 'system' in kwargs:
+            adduser_cmd.append('-d/nonexistent')
+            log_adduser_cmd.append('-d/nonexistent')
+        else:
+            adduser_cmd.append('-d/usr/home/%s' % name)
+	    adduser_cmd.append('-m')
+            log_adduser_cmd.append('-d/usr/home/%s' % name)
+	    log_adduser_cmd.append('-m')
+
+        # Run the command
+        LOG.info("Adding user %s", name)
+        try:
+            util.subp(adduser_cmd, logstring=log_adduser_cmd)
+        except Exception as e:
+            util.logexc(LOG, "Failed to create user %s", name)
+            raise e
+
+    # TODO:
+    def set_passwd(self, name, **kwargs):
+	return False
+
+    def lock_passwd(self, name):
+        try:
+            util.subp(['pw', 'usermod', name, '-h', '-'])
+        except Exception as e:
+            util.logexc(LOG, "Failed to lock user %s", name)
+            raise e
+
+    # TODO:
+    def write_sudo_rules(self, name, rules, sudo_file=None):
+	LOG.debug("[write_sudo_rules] Name: %s" % name)
+
+    def create_user(self, name, **kwargs):
+        self.add_user(name, **kwargs)
+
+        # Set password if plain-text password provided and non-empty
+        if 'plain_text_passwd' in kwargs and kwargs['plain_text_passwd']:
+            self.set_passwd(name, kwargs['plain_text_passwd'])
+
+        # Default locking down the account. 'lock_passwd' defaults to True.
+        # lock account unless lock_password is False.
+        if kwargs.get('lock_passwd', True):
+            self.lock_passwd(name)
+
+        # Configure sudo access
+        if 'sudo' in kwargs:
+            self.write_sudo_rules(name, kwargs['sudo'])
+
+        # Import SSH keys
+        if 'ssh_authorized_keys' in kwargs:
+            keys = set(kwargs['ssh_authorized_keys']) or []
+            ssh_util.setup_user_keys(keys, name, options=None)
+
+    def _write_network(self, settings):
+	return
+	
+    def apply_locale():
+	return
+	
+    def install_packages():
+	return
+
+    def package_command():
+	return
+
+    def set_timezone():
+	return
+
+    def update_package_sources():
+	return
+
-- 
cgit v1.2.3


From 45a3ef2157c21155a7d0a286849db330e767608d Mon Sep 17 00:00:00 2001
From: Harm Weites <harm@weites.com>
Date: Sat, 14 Dec 2013 18:58:31 +0000
Subject: change: Separate functions to load, read and write /etc/rc.conf keys
 and values. Use these right away to read and change the hostname.

---
 cloudinit/distros/freebsd.py | 54 ++++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 17 deletions(-)

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py
index 2d6cd924..55efbb7b 100644
--- a/cloudinit/distros/freebsd.py
+++ b/cloudinit/distros/freebsd.py
@@ -40,33 +40,53 @@ class Distro(distros.Distro):
         self._runner = helpers.Runners(paths)
         self.osfamily = 'freebsd'
 
+    # Updates a key in /etc/rc.conf.
     def updatercconf(self, key, value):
 	LOG.debug("updatercconf: %s => %s" % (key, value))
-        conf = {}
+        conf = self.loadrcconf()
 	configchanged = False
-	with open("/etc/rc.conf") as file:
-            for line in file:
-                tok = line.split('=')
-		# TODO: Handle keys with spaces, make this a bit more robust.
-		if tok[0] == key:
-		    if tok[1] != value:
-		        conf[tok[0]] = value 
-			LOG.debug("[rc.conf]: Value %s for key %s needs to be changed" % (value, key))
-			configchanged = True
-		else:
-		    conf[tok[0]] = tok[1].rstrip()
+        for item in conf:
+            if item == key and conf[item] != value:
+                conf[item] = value
+                LOG.debug("[rc.conf]: Value %s for key %s needs to be changed" % (value, key))
+                configchanged = True
 
         if configchanged:
             LOG.debug("Writing new /etc/rc.conf file")
-            with open ('/etc/rc.conf', 'w') as file:
+            with open('/etc/rc.conf', 'w') as file:
                for keyval in conf.items():
                    file.write("%s=%s\n" % keyval)
 
-    def _read_hostname():
-	return
+    # Load the contents of /etc/rc.conf and store all keys in a dict.
+    def loadrcconf(self):
+        conf = {}
+        with open("/etc/rc.conf") as file:
+            for line in file:
+                tok = line.split('=')
+                conf[tok[0]] = tok[1].rstrip()
+        return conf
 
-    def _read_system_hostname():
-	return
+    def readrcconf(self, key):
+        conf = self.loadrcconf()
+        try:
+            val = conf[key]
+	except KeyError:
+            val = None
+        return val
+
+    def _read_system_hostname(self):
+        sys_hostname = self._read_hostname()
+        return ('rc.conf', sys_hostname)
+
+    def _read_hostname(self, default=None):
+        hostname = None
+        try:
+            hostname = self.readrcconf('hostname')
+        except IOError:
+            pass
+        if not hostname:
+            return default
+        return hostname
 
     def _select_hostname(self, hostname, fqdn):
         if not hostname:
-- 
cgit v1.2.3


From 1781668dd65737a800c2c8fdbb79c6f1288d3ef2 Mon Sep 17 00:00:00 2001
From: Harm Weites <harm@weites.com>
Date: Wed, 18 Dec 2013 23:36:16 +0000
Subject: new: Apply the locale to the default login class.

---
 cloudinit/distros/freebsd.py | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py
index 55efbb7b..fd66b901 100644
--- a/cloudinit/distros/freebsd.py
+++ b/cloudinit/distros/freebsd.py
@@ -210,10 +210,32 @@ class Distro(distros.Distro):
 
     def _write_network(self, settings):
 	return
-	
-    def apply_locale():
-	return
-	
+
+    def apply_locale(self, locale, out_fn=None):
+        loginconf = '/etc/login.conf'
+        newloginconf = '/tmp/login.conf.new'
+        backupconf = '/etc/login.conf.orig'
+
+        newconf = open(newloginconf, 'w')
+        origconf = open(loginconf, 'r')
+
+        for line in origconf:
+            newconf.write(re.sub('^default:', r'default:lang=%s:' % locale, line))
+        newconf.close()
+        origconf.close()
+        # Make a backup of login.conf.
+        copyfile(loginconf, backupconf)
+        # And copy the new login.conf.
+        copyfile(newloginconf, loginconf)
+
+        try:
+            util.logexc("Running cap_mkdb for %s", locale)
+            util.subp(['cap_mkdb', '/etc/login.conf'])
+        except:
+            # cap_mkdb failed, so restore the backup.
+            util.logexc("Failed to apply locale %s", locale)
+            copyfile(backupconf, loginconf)
+
     def install_packages():
 	return
 
-- 
cgit v1.2.3


From 31ece5e92797bf20141878de5dd7cd91559cb336 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Wed, 22 Jan 2014 12:04:39 -0800
Subject: Split net-parsing into own module

The ubuntu/debian networking file parsing function
really is more generic than just a rhel utility function
and can be used by others that want to use this functionality
for there own purposes (say in writing down a freebsd network
format instead) so moving this to its own module to encourage
its usage outside of rhel.
---
 cloudinit/distros/net_util.py  | 110 +++++++++++++++++++++++++++++++++++++++++
 cloudinit/distros/rhel.py      |   4 +-
 cloudinit/distros/rhel_util.py |  88 ---------------------------------
 cloudinit/distros/sles.py      |   4 +-
 4 files changed, 116 insertions(+), 90 deletions(-)
 create mode 100644 cloudinit/distros/net_util.py

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/net_util.py b/cloudinit/distros/net_util.py
new file mode 100644
index 00000000..4c9095be
--- /dev/null
+++ b/cloudinit/distros/net_util.py
@@ -0,0 +1,110 @@
+# vi: ts=4 expandtab
+#
+#    Copyright (C) 2012 Canonical Ltd.
+#    Copyright (C) 2012, 2013 Hewlett-Packard Development Company, L.P.
+#    Copyright (C) 2012 Yahoo! Inc.
+#
+#    Author: Scott Moser <scott.moser@canonical.com>
+#    Author: Juerg Haefliger <juerg.haefliger@hp.com>
+#    Author: Joshua Harlow <harlowja@yahoo-inc.com>
+#
+#    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
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# This is a util function to translate debian based distro interface blobs as
+# given in /etc/network/interfaces to an *somewhat* agnostic format for
+# distributions that use other formats.
+#
+# TODO(harlowja) remove when we have python-netcf active...
+def translate_network(settings):
+    # Get the standard cmd, args from the ubuntu format
+    entries = []
+    for line in settings.splitlines():
+        line = line.strip()
+        if not line or line.startswith("#"):
+            continue
+        split_up = line.split(None, 1)
+        if len(split_up) <= 1:
+            continue
+        entries.append(split_up)
+    # Figure out where each iface section is
+    ifaces = []
+    consume = {}
+    for (cmd, args) in entries:
+        if cmd == 'iface':
+            if consume:
+                ifaces.append(consume)
+                consume = {}
+            consume[cmd] = args
+        else:
+            consume[cmd] = args
+    # Check if anything left over to consume
+    absorb = False
+    for (cmd, args) in consume.iteritems():
+        if cmd == 'iface':
+            absorb = True
+    if absorb:
+        ifaces.append(consume)
+    # Now translate
+    real_ifaces = {}
+    for info in ifaces:
+        if 'iface' not in info:
+            continue
+        iface_details = info['iface'].split(None)
+        dev_name = None
+        if len(iface_details) >= 1:
+            dev = iface_details[0].strip().lower()
+            if dev:
+                dev_name = dev
+        if not dev_name:
+            continue
+        iface_info = {}
+        if len(iface_details) >= 3:
+            proto_type = iface_details[2].strip().lower()
+            # Seems like this can be 'loopback' which we don't
+            # really care about
+            if proto_type in ['dhcp', 'static']:
+                iface_info['bootproto'] = proto_type
+        # These can just be copied over
+        for k in ['netmask', 'address', 'gateway', 'broadcast']:
+            if k in info:
+                val = info[k].strip().lower()
+                if val:
+                    iface_info[k] = val
+        # Name server info provided??
+        if 'dns-nameservers' in info:
+            iface_info['dns-nameservers'] = info['dns-nameservers'].split()
+        # Name server search info provided??
+        if 'dns-search' in info:
+            iface_info['dns-search'] = info['dns-search'].split()
+        # Is any mac address spoofing going on??
+        if 'hwaddress' in info:
+            hw_info = info['hwaddress'].lower().strip()
+            hw_split = hw_info.split(None, 1)
+            if len(hw_split) == 2 and hw_split[0].startswith('ether'):
+                hw_addr = hw_split[1]
+                if hw_addr:
+                    iface_info['hwaddress'] = hw_addr
+        real_ifaces[dev_name] = iface_info
+    # Check for those that should be started on boot via 'auto'
+    for (cmd, args) in entries:
+        if cmd == 'auto':
+            # Seems like auto can be like 'auto eth0 eth0:1' so just get the
+            # first part out as the device name
+            args = args.split(None)
+            if not args:
+                continue
+            dev_name = args[0].strip().lower()
+            if dev_name in real_ifaces:
+                real_ifaces[dev_name]['auto'] = True
+    return real_ifaces
diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py
index 30195384..6087929e 100644
--- a/cloudinit/distros/rhel.py
+++ b/cloudinit/distros/rhel.py
@@ -25,7 +25,9 @@ from cloudinit import helpers
 from cloudinit import log as logging
 from cloudinit import util
 
+from cloudinit.distros import net_util
 from cloudinit.distros import rhel_util
+
 from cloudinit.settings import PER_INSTANCE
 
 LOG = logging.getLogger(__name__)
@@ -63,7 +65,7 @@ class Distro(distros.Distro):
 
     def _write_network(self, settings):
         # TODO(harlowja) fix this... since this is the ubuntu format
-        entries = rhel_util.translate_network(settings)
+        entries = net_util.translate_network(settings)
         LOG.debug("Translated ubuntu style network settings %s into %s",
                   settings, entries)
         # Make the intermediate format as the rhel format...
diff --git a/cloudinit/distros/rhel_util.py b/cloudinit/distros/rhel_util.py
index 1aba58b8..063d536e 100644
--- a/cloudinit/distros/rhel_util.py
+++ b/cloudinit/distros/rhel_util.py
@@ -30,94 +30,6 @@ from cloudinit import util
 LOG = logging.getLogger(__name__)
 
 
-# This is a util function to translate Debian based distro interface blobs as
-# given in /etc/network/interfaces to an equivalent format for distributions
-# that use ifcfg-* style (Red Hat and SUSE).
-# TODO(harlowja) remove when we have python-netcf active...
-def translate_network(settings):
-    # Get the standard cmd, args from the ubuntu format
-    entries = []
-    for line in settings.splitlines():
-        line = line.strip()
-        if not line or line.startswith("#"):
-            continue
-        split_up = line.split(None, 1)
-        if len(split_up) <= 1:
-            continue
-        entries.append(split_up)
-    # Figure out where each iface section is
-    ifaces = []
-    consume = {}
-    for (cmd, args) in entries:
-        if cmd == 'iface':
-            if consume:
-                ifaces.append(consume)
-                consume = {}
-            consume[cmd] = args
-        else:
-            consume[cmd] = args
-    # Check if anything left over to consume
-    absorb = False
-    for (cmd, args) in consume.iteritems():
-        if cmd == 'iface':
-            absorb = True
-    if absorb:
-        ifaces.append(consume)
-    # Now translate
-    real_ifaces = {}
-    for info in ifaces:
-        if 'iface' not in info:
-            continue
-        iface_details = info['iface'].split(None)
-        dev_name = None
-        if len(iface_details) >= 1:
-            dev = iface_details[0].strip().lower()
-            if dev:
-                dev_name = dev
-        if not dev_name:
-            continue
-        iface_info = {}
-        if len(iface_details) >= 3:
-            proto_type = iface_details[2].strip().lower()
-            # Seems like this can be 'loopback' which we don't
-            # really care about
-            if proto_type in ['dhcp', 'static']:
-                iface_info['bootproto'] = proto_type
-        # These can just be copied over
-        for k in ['netmask', 'address', 'gateway', 'broadcast']:
-            if k in info:
-                val = info[k].strip().lower()
-                if val:
-                    iface_info[k] = val
-        # Name server info provided??
-        if 'dns-nameservers' in info:
-            iface_info['dns-nameservers'] = info['dns-nameservers'].split()
-        # Name server search info provided??
-        if 'dns-search' in info:
-            iface_info['dns-search'] = info['dns-search'].split()
-        # Is any mac address spoofing going on??
-        if 'hwaddress' in info:
-            hw_info = info['hwaddress'].lower().strip()
-            hw_split = hw_info.split(None, 1)
-            if len(hw_split) == 2 and hw_split[0].startswith('ether'):
-                hw_addr = hw_split[1]
-                if hw_addr:
-                    iface_info['hwaddress'] = hw_addr
-        real_ifaces[dev_name] = iface_info
-    # Check for those that should be started on boot via 'auto'
-    for (cmd, args) in entries:
-        if cmd == 'auto':
-            # Seems like auto can be like 'auto eth0 eth0:1' so just get the
-            # first part out as the device name
-            args = args.split(None)
-            if not args:
-                continue
-            dev_name = args[0].strip().lower()
-            if dev_name in real_ifaces:
-                real_ifaces[dev_name]['auto'] = True
-    return real_ifaces
-
-
 # Helper function to update a RHEL/SUSE /etc/sysconfig/* file
 def update_sysconfig_file(fn, adjustments, allow_empty=False):
     if not adjustments:
diff --git a/cloudinit/distros/sles.py b/cloudinit/distros/sles.py
index f2ac4efc..239e51b5 100644
--- a/cloudinit/distros/sles.py
+++ b/cloudinit/distros/sles.py
@@ -26,7 +26,9 @@ from cloudinit import helpers
 from cloudinit import log as logging
 from cloudinit import util
 
+from cloudinit.distros import net_util
 from cloudinit.distros import rhel_util
+
 from cloudinit.settings import PER_INSTANCE
 
 LOG = logging.getLogger(__name__)
@@ -54,7 +56,7 @@ class Distro(distros.Distro):
 
     def _write_network(self, settings):
         # Convert debian settings to ifcfg format
-        entries = rhel_util.translate_network(settings)
+        entries = net_util.translate_network(settings)
         LOG.debug("Translated ubuntu style network settings %s into %s",
                   settings, entries)
         # Make the intermediate format as the suse format...
-- 
cgit v1.2.3


From 5f14b91c2a17101e845ee18068c7bb8c3c7a0556 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Wed, 22 Jan 2014 12:39:37 -0800
Subject: Add comments as to format with example in/out

---
 cloudinit/distros/net_util.py | 52 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/net_util.py b/cloudinit/distros/net_util.py
index 4c9095be..8c781f9a 100644
--- a/cloudinit/distros/net_util.py
+++ b/cloudinit/distros/net_util.py
@@ -26,6 +26,58 @@
 # distributions that use other formats.
 #
 # TODO(harlowja) remove when we have python-netcf active...
+#
+# The format is the following:
+# {
+#    <device-name>: {
+#        # All optional (if not existent in original format)
+#        "netmask": <ip>,
+#        "broadcast": <ip>,
+#        "gateway": <ip>,
+#        "address": <ip>,
+#        "bootproto": "static"|"dhcp",
+#        "dns-search": <hostname>,
+#        "hwaddress": <mac-address>,
+#        "auto": True (or non-existent),
+#        "dns-nameservers": [<ip/hostname>, ...],
+#    }
+# }
+#
+# Things to note, comments are removed, if a ubuntu/debian interface is
+# marked as auto then only then first segment (?) is retained, ie
+# 'auto eth0 eth0:1' just marks eth0 as auto (not eth0:1).
+#
+# Example input:
+#
+# auto lo
+# iface lo inet loopback
+# 
+# auto eth0
+# iface eth0 inet static
+#         address 10.0.0.1
+#         netmask 255.255.252.0
+#         broadcast 10.0.0.255
+#         gateway 10.0.0.2
+#         dns-nameservers 98.0.0.1 98.0.0.2
+#
+# Example output:
+# {
+#     "lo": {
+#         "auto": true
+#     }, 
+#     "eth0": {
+#         "auto": true, 
+#         "dns-nameservers": [
+#             "98.0.0.1", 
+#             "98.0.0.2"
+#         ], 
+#         "broadcast": "10.0.0.255", 
+#         "netmask": "255.255.252.0", 
+#         "bootproto": "static", 
+#         "address": "10.0.0.1", 
+#         "gateway": "10.0.0.2"
+#     }
+# }
 def translate_network(settings):
     # Get the standard cmd, args from the ubuntu format
     entries = []
-- 
cgit v1.2.3


From efe969756d0208433e953d1692ea85006a56abe3 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Wed, 22 Jan 2014 12:47:51 -0800
Subject: Add a new line

---
 cloudinit/distros/net_util.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/net_util.py b/cloudinit/distros/net_util.py
index 8c781f9a..5f60666d 100644
--- a/cloudinit/distros/net_util.py
+++ b/cloudinit/distros/net_util.py
@@ -78,6 +78,7 @@
 #         "gateway": "10.0.0.2"
 #     }
 # }
+
 def translate_network(settings):
     # Get the standard cmd, args from the ubuntu format
     entries = []
-- 
cgit v1.2.3


From c0ee33fc1d70b272a96430def658afd6f1867afa Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Thu, 23 Jan 2014 14:06:13 -0500
Subject: remove some white space

---
 cloudinit/distros/rhel.py | 1 -
 cloudinit/distros/sles.py | 1 -
 2 files changed, 2 deletions(-)

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py
index 6087929e..e8abf111 100644
--- a/cloudinit/distros/rhel.py
+++ b/cloudinit/distros/rhel.py
@@ -27,7 +27,6 @@ from cloudinit import util
 
 from cloudinit.distros import net_util
 from cloudinit.distros import rhel_util
-
 from cloudinit.settings import PER_INSTANCE
 
 LOG = logging.getLogger(__name__)
diff --git a/cloudinit/distros/sles.py b/cloudinit/distros/sles.py
index 239e51b5..9788a1ba 100644
--- a/cloudinit/distros/sles.py
+++ b/cloudinit/distros/sles.py
@@ -28,7 +28,6 @@ from cloudinit import util
 
 from cloudinit.distros import net_util
 from cloudinit.distros import rhel_util
-
 from cloudinit.settings import PER_INSTANCE
 
 LOG = logging.getLogger(__name__)
-- 
cgit v1.2.3


From eff68fbbb7eb9e5a9a9d9cab4ab357edd1476859 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Thu, 23 Jan 2014 16:25:58 -0500
Subject: pep8/tab to 8 spaces

---
 cloudinit/distros/freebsd.py | 72 ++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py
index fd66b901..a62503f6 100644
--- a/cloudinit/distros/freebsd.py
+++ b/cloudinit/distros/freebsd.py
@@ -31,6 +31,7 @@ from cloudinit.settings import PER_INSTANCE
 
 LOG = logging.getLogger(__name__)
 
+
 class Distro(distros.Distro):
     def __init__(self, name, cfg, paths):
         distros.Distro.__init__(self, name, cfg, paths)
@@ -42,9 +43,9 @@ class Distro(distros.Distro):
 
     # Updates a key in /etc/rc.conf.
     def updatercconf(self, key, value):
-	LOG.debug("updatercconf: %s => %s" % (key, value))
+        LOG.debug("updatercconf: %s => %s" % (key, value))
         conf = self.loadrcconf()
-	configchanged = False
+        configchanged = False
         for item in conf:
             if item == key and conf[item] != value:
                 conf[item] = value
@@ -54,8 +55,8 @@ class Distro(distros.Distro):
         if configchanged:
             LOG.debug("Writing new /etc/rc.conf file")
             with open('/etc/rc.conf', 'w') as file:
-               for keyval in conf.items():
-                   file.write("%s=%s\n" % keyval)
+                for keyval in conf.items():
+                    file.write("%s=%s\n" % keyval)
 
     # Load the contents of /etc/rc.conf and store all keys in a dict.
     def loadrcconf(self):
@@ -70,7 +71,7 @@ class Distro(distros.Distro):
         conf = self.loadrcconf()
         try:
             val = conf[key]
-	except KeyError:
+        except KeyError:
             val = None
         return val
 
@@ -94,7 +95,7 @@ class Distro(distros.Distro):
         return hostname
 
     def _write_hostname(self, your_hostname, out_fn):
-       self.updatercconf('hostname', your_hostname)
+        self.updatercconf('hostname', your_hostname)
 
     def create_group(self, name, members):
         group_add_cmd = ['pw', '-n', name]
@@ -124,26 +125,26 @@ class Distro(distros.Distro):
         adduser_cmd = ['pw', 'useradd', '-n', name]
         log_adduser_cmd = ['pw', 'useradd', '-n', name]
 
-	adduser_opts = {
-		"homedir": '-d',
-		"gecos": '-c',
-		"primary_group": '-g',
-		"groups": '-G',
-		"passwd": '-h',
-		"shell": '-s',
-		"inactive": '-E',
-	}
-	adduser_flags = {
-		"no_user_group": '--no-user-group',
-		"system": '--system',
-		"no_log_init": '--no-log-init',
-	}
-
-	redact_opts = ['passwd']
-
-	for key, val in kwargs.iteritems():
-	    if key in adduser_opts and val and isinstance(val, str):
-               	adduser_cmd.extend([adduser_opts[key], val])
+        adduser_opts = {
+                "homedir": '-d',
+                "gecos": '-c',
+                "primary_group": '-g',
+                "groups": '-G',
+                "passwd": '-h',
+                "shell": '-s',
+                "inactive": '-E',
+        }
+        adduser_flags = {
+                "no_user_group": '--no-user-group',
+                "system": '--system',
+                "no_log_init": '--no-log-init',
+        }
+
+        redact_opts = ['passwd']
+
+        for key, val in kwargs.iteritems():
+            if key in adduser_opts and val and isinstance(val, str):
+                adduser_cmd.extend([adduser_opts[key], val])
 
                 # Redact certain fields from the logs
                 if key in redact_opts:
@@ -160,9 +161,9 @@ class Distro(distros.Distro):
             log_adduser_cmd.append('-d/nonexistent')
         else:
             adduser_cmd.append('-d/usr/home/%s' % name)
-	    adduser_cmd.append('-m')
+            adduser_cmd.append('-m')
             log_adduser_cmd.append('-d/usr/home/%s' % name)
-	    log_adduser_cmd.append('-m')
+            log_adduser_cmd.append('-m')
 
         # Run the command
         LOG.info("Adding user %s", name)
@@ -174,7 +175,7 @@ class Distro(distros.Distro):
 
     # TODO:
     def set_passwd(self, name, **kwargs):
-	return False
+        return False
 
     def lock_passwd(self, name):
         try:
@@ -185,7 +186,7 @@ class Distro(distros.Distro):
 
     # TODO:
     def write_sudo_rules(self, name, rules, sudo_file=None):
-	LOG.debug("[write_sudo_rules] Name: %s" % name)
+        LOG.debug("[write_sudo_rules] Name: %s" % name)
 
     def create_user(self, name, **kwargs):
         self.add_user(name, **kwargs)
@@ -209,7 +210,7 @@ class Distro(distros.Distro):
             ssh_util.setup_user_keys(keys, name, options=None)
 
     def _write_network(self, settings):
-	return
+        return
 
     def apply_locale(self, locale, out_fn=None):
         loginconf = '/etc/login.conf'
@@ -237,14 +238,13 @@ class Distro(distros.Distro):
             copyfile(backupconf, loginconf)
 
     def install_packages():
-	return
+        return
 
     def package_command():
-	return
+        return
 
     def set_timezone():
-	return
+        return
 
     def update_package_sources():
-	return
-
+        return
-- 
cgit v1.2.3


From 75d6f035bcd94e6420ba6de5a9d12c1f554771cf Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Thu, 23 Jan 2014 16:31:40 -0500
Subject: fix freebsd new file header

---
 cloudinit/distros/freebsd.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py
index a62503f6..f1650a77 100644
--- a/cloudinit/distros/freebsd.py
+++ b/cloudinit/distros/freebsd.py
@@ -1,12 +1,8 @@
 # vi: ts=4 expandtab
 #
-#    Copyright (C) 2012 Canonical Ltd.
-#    Copyright (C) 2012, 2013 Hewlett-Packard Development Company, L.P.
-#    Copyright (C) 2012 Yahoo! Inc.
+#    Copyright (C) 2014 Harm Weites
 #
-#    Author: Scott Moser <scott.moser@canonical.com>
-#    Author: Juerg Haefliger <juerg.haefliger@hp.com>
-#    Author: Joshua Harlow <harlowja@yahoo-inc.com>
+#    Author: Harm Weites <harm@weites.com> 
 #
 #    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
-- 
cgit v1.2.3


From c92cd051a1d598f83de03c4135c800b17fd46a9a Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 24 Jan 2014 14:47:28 -0500
Subject: pep8/pylint fixes

tools/run-pep8 wasn't checking all python files.
tools/run-pylint wasnt checking bin/cloud-init

fixed resultant pep8 issues after finding them.
---
 cloudinit/distros/freebsd.py  |  2 +-
 cloudinit/distros/net_util.py | 18 +++++++++---------
 doc/rtd/conf.py               |  3 ++-
 setup.py                      |  6 +++---
 tools/run-pep8                | 11 +----------
 tools/run-pylint              |  2 +-
 6 files changed, 17 insertions(+), 25 deletions(-)

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py
index f1650a77..d28860eb 100644
--- a/cloudinit/distros/freebsd.py
+++ b/cloudinit/distros/freebsd.py
@@ -2,7 +2,7 @@
 #
 #    Copyright (C) 2014 Harm Weites
 #
-#    Author: Harm Weites <harm@weites.com> 
+#    Author: Harm Weites <harm@weites.com>
 #
 #    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
diff --git a/cloudinit/distros/net_util.py b/cloudinit/distros/net_util.py
index 5f60666d..b9bcfd8b 100644
--- a/cloudinit/distros/net_util.py
+++ b/cloudinit/distros/net_util.py
@@ -51,7 +51,7 @@
 #
 # auto lo
 # iface lo inet loopback
-# 
+#
 # auto eth0
 # iface eth0 inet static
 #         address 10.0.0.1
@@ -64,17 +64,17 @@
 # {
 #     "lo": {
 #         "auto": true
-#     }, 
+#     },
 #     "eth0": {
-#         "auto": true, 
+#         "auto": true,
 #         "dns-nameservers": [
-#             "98.0.0.1", 
+#             "98.0.0.1",
 #             "98.0.0.2"
-#         ], 
-#         "broadcast": "10.0.0.255", 
-#         "netmask": "255.255.252.0", 
-#         "bootproto": "static", 
-#         "address": "10.0.0.1", 
+#         ],
+#         "broadcast": "10.0.0.255",
+#         "netmask": "255.255.252.0",
+#         "bootproto": "static",
+#         "address": "10.0.0.1",
 #         "gateway": "10.0.0.2"
 #     }
 # }
diff --git a/doc/rtd/conf.py b/doc/rtd/conf.py
index c9ae79f4..52a8f92b 100644
--- a/doc/rtd/conf.py
+++ b/doc/rtd/conf.py
@@ -1,4 +1,5 @@
-import sys, os
+import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
diff --git a/setup.py b/setup.py
index 8d18b97e..9118e5f6 100755
--- a/setup.py
+++ b/setup.py
@@ -63,7 +63,7 @@ def tiny_p(cmd, capture=True):
     (out, err) = sp.communicate()
     ret = sp.returncode  # pylint: disable=E1101
     if ret not in [0]:
-        raise RuntimeError("Failed running %s [rc=%s] (%s, %s)" 
+        raise RuntimeError("Failed running %s [rc=%s] (%s, %s)"
                             % (cmd, ret, out, err))
     return (out, err)
 
@@ -102,7 +102,7 @@ class InitsysInstallData(install):
                  " specifying a init system!") % (", ".join(INITSYS_TYPES)))
         elif self.init_system:
             self.distribution.data_files.append(
-                (INITSYS_ROOTS[self.init_system], 
+                (INITSYS_ROOTS[self.init_system],
                  INITSYS_FILES[self.init_system]))
             # Force that command to reinitalize (with new file list)
             self.distribution.reinitialize_command('install_data', True)
@@ -134,7 +134,7 @@ setuptools.setup(name='cloud-init',
                    [f for f in glob('doc/examples/seed/*') if is_f(f)]),
                  ],
       install_requires=read_requires(),
-      cmdclass = {
+      cmdclass={
           # Use a subclass for install that handles
           # adding on the right init system configuration files
           'install': InitsysInstallData,
diff --git a/tools/run-pep8 b/tools/run-pep8
index 20e594bc..cfce5edd 100755
--- a/tools/run-pep8
+++ b/tools/run-pep8
@@ -1,15 +1,7 @@
 #!/bin/bash
 
-ci_files='cloudinit/*.py cloudinit/config/*.py'
-test_files=$(find tests -name "*.py")
-def_files="$ci_files $test_files"
-
 if [ $# -eq 0 ]; then
-   files=( )
-   for f in $def_files; do
-      [ -f "$f" ] || { echo "failed, $f not a file" 1>&2; exit 1; }
-      files[${#files[@]}]=${f}
-   done
+   files=( bin/cloud-init $(find * -name "*.py" -type f) )
 else
    files=( "$@" );
 fi
@@ -44,4 +36,3 @@ cmd=(
 echo -e "\nRunning 'cloudinit' pep8:"
 echo "${cmd[@]}"
 "${cmd[@]}"
-
diff --git a/tools/run-pylint b/tools/run-pylint
index b74efda9..0b7c16d4 100755
--- a/tools/run-pylint
+++ b/tools/run-pylint
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ $# -eq 0 ]; then
-   files=( $(find * -name "*.py" -type f) )
+   files=( bin/cloud-init $(find * -name "*.py" -type f) )
 else
    files=( "$@" );
 fi 
-- 
cgit v1.2.3


From 4919cd124e57e82ecfcdaa9bfcbc051c719708e6 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 24 Jan 2014 15:29:09 -0500
Subject: pylint and long line fixes.

This fixes up many long lines to be < 80 chars and some other
pylint issues.  pylint 1.1 (in trusty) is now complaining about
the lazy logging, so I'll clean that up when I touch things.
---
 cloudinit/config/cc_growpart.py                    |  3 +-
 cloudinit/distros/freebsd.py                       | 47 +++++++++++-----------
 cloudinit/netinfo.py                               | 30 ++++++--------
 cloudinit/user_data.py                             |  3 +-
 cloudinit/util.py                                  | 12 +++---
 .../unittests/test_datasource/test_configdrive.py  |  2 +-
 6 files changed, 49 insertions(+), 48 deletions(-)

(limited to 'cloudinit/distros')

diff --git a/cloudinit/config/cc_growpart.py b/cloudinit/config/cc_growpart.py
index b81951ad..f52c41f0 100644
--- a/cloudinit/config/cc_growpart.py
+++ b/cloudinit/config/cc_growpart.py
@@ -223,7 +223,8 @@ def resize_devices(resizer, devices):
                          "stat of '%s' failed: %s" % (blockdev, e),))
             continue
 
-        if not stat.S_ISBLK(statret.st_mode) and not stat.S_ISCHR(statret.st_mode):
+        if (not stat.S_ISBLK(statret.st_mode) and
+                not stat.S_ISCHR(statret.st_mode)):
             info.append((devent, RESIZE.SKIPPED,
                          "device '%s' not a block device" % blockdev,))
             continue
diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py
index d28860eb..4c0c6d29 100644
--- a/cloudinit/distros/freebsd.py
+++ b/cloudinit/distros/freebsd.py
@@ -16,15 +16,14 @@
 #    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 re
+
 from cloudinit import distros
 from cloudinit import helpers
 from cloudinit import log as logging
-from cloudinit import netinfo
 from cloudinit import ssh_util
 from cloudinit import util
 
-from cloudinit.settings import PER_INSTANCE
-
 LOG = logging.getLogger(__name__)
 
 
@@ -39,26 +38,27 @@ class Distro(distros.Distro):
 
     # Updates a key in /etc/rc.conf.
     def updatercconf(self, key, value):
-        LOG.debug("updatercconf: %s => %s" % (key, value))
+        LOG.debug("updatercconf: %s => %s", key, value)
         conf = self.loadrcconf()
         configchanged = False
         for item in conf:
             if item == key and conf[item] != value:
                 conf[item] = value
-                LOG.debug("[rc.conf]: Value %s for key %s needs to be changed" % (value, key))
+                LOG.debug("[rc.conf]: Value %s for key %s needs to be changed",
+                          value, key)
                 configchanged = True
 
         if configchanged:
             LOG.debug("Writing new /etc/rc.conf file")
-            with open('/etc/rc.conf', 'w') as file:
+            with open('/etc/rc.conf', 'w') as fp:
                 for keyval in conf.items():
-                    file.write("%s=%s\n" % keyval)
+                    fp.write("%s=%s\n" % keyval)
 
     # Load the contents of /etc/rc.conf and store all keys in a dict.
     def loadrcconf(self):
         conf = {}
-        with open("/etc/rc.conf") as file:
-            for line in file:
+        with open("/etc/rc.conf") as fp:
+            for line in fp:
                 tok = line.split('=')
                 conf[tok[0]] = tok[1].rstrip()
         return conf
@@ -75,7 +75,7 @@ class Distro(distros.Distro):
         sys_hostname = self._read_hostname()
         return ('rc.conf', sys_hostname)
 
-    def _read_hostname(self, default=None):
+    def _read_hostname(self, filename, default=None):
         hostname = None
         try:
             hostname = self.readrcconf('hostname')
@@ -90,17 +90,17 @@ class Distro(distros.Distro):
             return fqdn
         return hostname
 
-    def _write_hostname(self, your_hostname, out_fn):
-        self.updatercconf('hostname', your_hostname)
+    def _write_hostname(self, hostname, filename):
+        self.updatercconf('hostname', hostname)
 
     def create_group(self, name, members):
         group_add_cmd = ['pw', '-n', name]
         if util.is_group(name):
-            LOG.warn("Skipping creation of existing group '%s'" % name)
+            LOG.warn("Skipping creation of existing group '%s'", name)
         else:
             try:
                 util.subp(group_add_cmd)
-                LOG.info("Created new group %s" % name)
+                LOG.info("Created new group %s", name)
             except Exception:
                 util.logexc("Failed to create group %s", name)
 
@@ -111,11 +111,11 @@ class Distro(distros.Distro):
                                      "; user does not exist.", member, name)
                     continue
                 util.subp(['pw', 'usermod', '-n', name, '-G', member])
-                LOG.info("Added user '%s' to group '%s'" % (member, name))
+                LOG.info("Added user '%s' to group '%s'", member, name)
 
     def add_user(self, name, **kwargs):
         if util.is_user(name):
-            LOG.info("User %s already exists, skipping." % name)
+            LOG.info("User %s already exists, skipping.", name)
             return False
 
         adduser_cmd = ['pw', 'useradd', '-n', name]
@@ -170,7 +170,7 @@ class Distro(distros.Distro):
             raise e
 
     # TODO:
-    def set_passwd(self, name, **kwargs):
+    def set_passwd(self, user, passwd, hashed=False):
         return False
 
     def lock_passwd(self, name):
@@ -182,7 +182,7 @@ class Distro(distros.Distro):
 
     # TODO:
     def write_sudo_rules(self, name, rules, sudo_file=None):
-        LOG.debug("[write_sudo_rules] Name: %s" % name)
+        LOG.debug("[write_sudo_rules] Name: %s", name)
 
     def create_user(self, name, **kwargs):
         self.add_user(name, **kwargs)
@@ -217,7 +217,8 @@ class Distro(distros.Distro):
         origconf = open(loginconf, 'r')
 
         for line in origconf:
-            newconf.write(re.sub('^default:', r'default:lang=%s:' % locale, line))
+            newconf.write(re.sub(r'^default:',
+                                 r'default:lang=%s:' % locale, line))
         newconf.close()
         origconf.close()
         # Make a backup of login.conf.
@@ -233,14 +234,14 @@ class Distro(distros.Distro):
             util.logexc("Failed to apply locale %s", locale)
             copyfile(backupconf, loginconf)
 
-    def install_packages():
+    def install_packages(self, pkglist):
         return
 
-    def package_command():
+    def package_command(self, cmd, args=None, pkgs=None):
         return
 
-    def set_timezone():
+    def set_timezone(self, tz):
         return
 
-    def update_package_sources():
+    def update_package_sources(self):
         return
diff --git a/cloudinit/netinfo.py b/cloudinit/netinfo.py
index 63f720e4..ac3c011f 100644
--- a/cloudinit/netinfo.py
+++ b/cloudinit/netinfo.py
@@ -44,7 +44,7 @@ def netdev_info(empty=""):
         # If the output of ifconfig doesn't contain the required info in the
         # obvious place, use a regex filter to be sure.
         elif len(toks) > 1:
-            if re.search("flags=\d+<up,", toks[1]):
+            if re.search(r"flags=\d+<up,", toks[1]):
                 devs[curdev]['up'] = True
 
         fieldpost = ""
@@ -58,11 +58,8 @@ def netdev_info(empty=""):
                 except IndexError:
                     pass
 
-            """
-            Couple the different items we're interested in with the correct field
-            since FreeBSD/CentOS/Fedora differ in the output.
-            """
-
+            # Couple the different items we're interested in with the correct
+            # field since FreeBSD/CentOS/Fedora differ in the output.
             ifconfigfields = {
                 "addr:": "addr", "inet": "addr",
                 "bcast:": "bcast", "broadcast": "bcast",
@@ -98,17 +95,16 @@ def route_info():
             continue
         toks = line.split()
 
-        """
-        FreeBSD shows 6 items in the routing table:
-          Destination        Gateway            Flags    Refs      Use  Netif Expire
-          default            10.65.0.1          UGS         0    34920 vtnet0
-
-        Linux netstat shows 2 more:
-          Destination     Gateway         Genmask         Flags   MSS Window  irtt Iface
-          0.0.0.0         10.65.0.1       0.0.0.0         UG        0 0          0 eth0
-        """
-
-        if len(toks) < 6 or toks[0] == "Kernel" or toks[0] == "Destination" or toks[0] == "Internet" or toks[0] == "Internet6" or toks[0] == "Routing":
+        # FreeBSD shows 6 items in the routing table:
+        #  Destination  Gateway    Flags Refs    Use  Netif Expire
+        #  default      10.65.0.1  UGS      0  34920 vtnet0
+        #
+        # Linux netstat shows 2 more:
+        #  Destination  Gateway    Genmask  Flags MSS Window irtt Iface
+        #  0.0.0.0      10.65.0.1  0.0.0.0  UG      0 0         0 eth0
+        if (len(toks) < 6 or toks[0] == "Kernel" or
+                toks[0] == "Destination" or toks[0] == "Internet" or
+                toks[0] == "Internet6" or toks[0] == "Routing"):
             continue
 
         if len(toks) < 8:
diff --git a/cloudinit/user_data.py b/cloudinit/user_data.py
index 3032ef70..de6487d8 100644
--- a/cloudinit/user_data.py
+++ b/cloudinit/user_data.py
@@ -311,7 +311,8 @@ class UserDataProcessor(object):
     def _attach_part(self, outer_msg, part):
         """
         Attach a message to an outer message. outermsg must be a MIMEMultipart.
-        Modifies a header in the outer message to keep track of number of attachments.
+        Modifies a header in the outer message to keep track of number of
+        attachments.
         """
         part_count = self._multi_part_count(outer_msg)
         self._process_before_attach(part, part_count + 1)
diff --git a/cloudinit/util.py b/cloudinit/util.py
index e1263f47..d350ba08 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -963,7 +963,7 @@ def is_resolvable(name):
                 pass
         _DNS_REDIRECT_IP = badips
         if badresults:
-            LOG.debug("detected dns redirection: %s" % badresults)
+            LOG.debug("detected dns redirection: %s", badresults)
 
     try:
         result = socket.getaddrinfo(name, None)
@@ -1322,6 +1322,7 @@ def mounts():
             (mountoutput, _err) = subp("mount")
             mount_locs = mountoutput.splitlines()
             method = 'mount'
+        mountre = r'^(/dev/[\S]+) on (/.*) \((.+), .+, (.+)\)$'
         for mpline in mount_locs:
             # Linux: /dev/sda1 on /boot type ext4 (rw,relatime,data=ordered)
             # FreeBSD: /dev/vtbd0p2 on / (ufs, local, journaled soft-updates)
@@ -1329,7 +1330,7 @@ def mounts():
                 if method == 'proc':
                     (dev, mp, fstype, opts, _freq, _passno) = mpline.split()
                 else:
-                    m = re.search('^(/dev/[\S]+) on (/.*) \((.+), .+, (.+)\)$', mpline)
+                    m = re.search(mountre, mpline)
                     dev = m.group(1)
                     mp = m.group(2)
                     fstype = m.group(3)
@@ -1403,7 +1404,7 @@ def get_builtin_cfg():
 
 
 def sym_link(source, link):
-    LOG.debug("Creating symbolic link from %r => %r" % (link, source))
+    LOG.debug("Creating symbolic link from %r => %r", link, source)
     os.symlink(source, link)
 
 
@@ -1444,7 +1445,8 @@ def uptime():
             size = ctypes.c_size_t()
             buf = ctypes.c_int()
             size.value = ctypes.sizeof(buf)
-            libc.sysctlbyname("kern.boottime", ctypes.byref(buf), ctypes.byref(size), None, 0)
+            libc.sysctlbyname("kern.boottime", ctypes.byref(buf),
+                              ctypes.byref(size), None, 0)
             now = time.time()
             bootup = buf.value
             uptime_str = now - bootup
@@ -1793,7 +1795,7 @@ def parse_mount(path):
     (mountoutput, _err) = subp("mount")
     mount_locs = mountoutput.splitlines()
     for line in mount_locs:
-        m = re.search('^(/dev/[\S]+) on (/.*) \((.+), .+, (.+)\)$', line)
+        m = re.search(r'^(/dev/[\S]+) on (/.*) \((.+), .+, (.+)\)$', line)
         devpth = m.group(1)
         mount_point = m.group(2)
         fs_type = m.group(3)
diff --git a/tests/unittests/test_datasource/test_configdrive.py b/tests/unittests/test_datasource/test_configdrive.py
index 3c1e8add..1f4a0a0b 100644
--- a/tests/unittests/test_datasource/test_configdrive.py
+++ b/tests/unittests/test_datasource/test_configdrive.py
@@ -285,7 +285,7 @@ class TestConfigDriveDataSource(MockerTestCase):
             self.assertEqual(["/dev/vdb", "/dev/zdd"],
                              ds.find_candidate_devs())
 
-            # verify that partitions are considered, but only if they have a label.
+            # verify that partitions are considered, that have correct label.
             devs_with_answers = {"TYPE=vfat": ["/dev/sda1"],
                 "TYPE=iso9660": [], "LABEL=config-2": ["/dev/vdb3"]}
             self.assertEqual(["/dev/vdb3"],
-- 
cgit v1.2.3


From eb1cc91597656414642ca7b66d5912882acd7ffc Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Fri, 24 Jan 2014 15:20:56 -0800
Subject: Freebsd cleanups

- Remove direct usage of open() and use the
  corresponding helpers instead.
- Fix the non-existence of the copyfile routine
  and just use the ones that do exist in the
  utils module to do the file backup.
- Use class level constants for the various file
  names read, this matches the same usage in the
  other distro types.
---
 cloudinit/distros/freebsd.py | 62 ++++++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py
index 4c0c6d29..d9d51dea 100644
--- a/cloudinit/distros/freebsd.py
+++ b/cloudinit/distros/freebsd.py
@@ -16,6 +16,8 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from StringIO import StringIO
+
 import re
 
 from cloudinit import distros
@@ -28,6 +30,10 @@ LOG = logging.getLogger(__name__)
 
 
 class Distro(distros.Distro):
+    rc_conf_fn = "/etc/rc.conf"
+    login_conf_fn = '/etc/login.conf'
+    login_conf_fn_bak = '/etc/login.conf.orig'
+
     def __init__(self, name, cfg, paths):
         distros.Distro.__init__(self, name, cfg, paths)
         # This will be used to restrict certain
@@ -40,27 +46,28 @@ class Distro(distros.Distro):
     def updatercconf(self, key, value):
         LOG.debug("updatercconf: %s => %s", key, value)
         conf = self.loadrcconf()
-        configchanged = False
+        config_changed = False
         for item in conf:
             if item == key and conf[item] != value:
                 conf[item] = value
                 LOG.debug("[rc.conf]: Value %s for key %s needs to be changed",
                           value, key)
-                configchanged = True
+                config_changed = True
 
-        if configchanged:
-            LOG.debug("Writing new /etc/rc.conf file")
-            with open('/etc/rc.conf', 'w') as fp:
-                for keyval in conf.items():
-                    fp.write("%s=%s\n" % keyval)
+        if config_changed:
+            LOG.debug("Writing new %s file", self.rc_conf_fn)
+            buf = StringIO()
+            for keyval in conf.items():
+                buf.write("%s=%s\n" % keyval)
+            util.write_file(self.rc_conf_fn, buf.getvalue())
 
     # Load the contents of /etc/rc.conf and store all keys in a dict.
     def loadrcconf(self):
         conf = {}
-        with open("/etc/rc.conf") as fp:
-            for line in fp:
-                tok = line.split('=')
-                conf[tok[0]] = tok[1].rstrip()
+        lines = util.load_file(self.rc_conf_fn).splitlines()
+        for line in lines:
+            tok = line.split('=')
+            conf[tok[0]] = tok[1].rstrip()
         return conf
 
     def readrcconf(self, key):
@@ -139,7 +146,7 @@ class Distro(distros.Distro):
         redact_opts = ['passwd']
 
         for key, val in kwargs.iteritems():
-            if key in adduser_opts and val and isinstance(val, str):
+            if key in adduser_opts and val and isinstance(val, basestring):
                 adduser_cmd.extend([adduser_opts[key], val])
 
                 # Redact certain fields from the logs
@@ -209,30 +216,29 @@ class Distro(distros.Distro):
         return
 
     def apply_locale(self, locale, out_fn=None):
-        loginconf = '/etc/login.conf'
-        newloginconf = '/tmp/login.conf.new'
-        backupconf = '/etc/login.conf.orig'
-
-        newconf = open(newloginconf, 'w')
-        origconf = open(loginconf, 'r')
-
-        for line in origconf:
+        # Adjust the locals value to the new value
+        newconf = StringIO()
+        for line in util.load_file(self.login_conf_fn).splitlines():
             newconf.write(re.sub(r'^default:',
                                  r'default:lang=%s:' % locale, line))
-        newconf.close()
-        origconf.close()
+            newconf.write("\n")
+
         # Make a backup of login.conf.
-        copyfile(loginconf, backupconf)
-        # And copy the new login.conf.
-        copyfile(newloginconf, loginconf)
+        util.copy(self.login_conf_fn, self.login_conf_fn_bak)
+
+        # And write the new login.conf.
+        util.write_file(self.login_conf_fn, newconf.getvalue())
 
         try:
             util.logexc("Running cap_mkdb for %s", locale)
-            util.subp(['cap_mkdb', '/etc/login.conf'])
-        except:
+            util.subp(['cap_mkdb', self.login_conf_fn])
+        except util.ProcessExecutionError:
             # cap_mkdb failed, so restore the backup.
             util.logexc("Failed to apply locale %s", locale)
-            copyfile(backupconf, loginconf)
+            try:
+                util.copy(self.login_conf_fn_bak, self.login_conf_fn)
+            except IOError:
+                pass
 
     def install_packages(self, pkglist):
         return
-- 
cgit v1.2.3


From d32091e5016924e15a956d264f5d44ccc8613e2a Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Fri, 24 Jan 2014 15:23:57 -0800
Subject: Log failure to restore backup locale file

---
 cloudinit/distros/freebsd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py
index d9d51dea..ab5e334a 100644
--- a/cloudinit/distros/freebsd.py
+++ b/cloudinit/distros/freebsd.py
@@ -238,7 +238,7 @@ class Distro(distros.Distro):
             try:
                 util.copy(self.login_conf_fn_bak, self.login_conf_fn)
             except IOError:
-                pass
+                util.logexc("Failed to restore %s backup", self.login_conf_fn)
 
     def install_packages(self, pkglist):
         return
-- 
cgit v1.2.3


From 8c7aecbb695f50514ae1bea9c105176b6345fb95 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Fri, 24 Jan 2014 17:34:52 -0800
Subject: Fix logexc usage in freebsd distro

- There appeared to be a few logexc calls
  that did not pass the logger in, fix those
  locations where this occured.
- When a group member adding fails, log the
  error and try the next member instead of
  failing adding any more members
---
 cloudinit/distros/freebsd.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py
index ab5e334a..0f1656c3 100644
--- a/cloudinit/distros/freebsd.py
+++ b/cloudinit/distros/freebsd.py
@@ -109,16 +109,20 @@ class Distro(distros.Distro):
                 util.subp(group_add_cmd)
                 LOG.info("Created new group %s", name)
             except Exception:
-                util.logexc("Failed to create group %s", name)
+                util.logexc(LOG, "Failed to create group %s", name)
 
         if len(members) > 0:
             for member in members:
                 if not util.is_user(member):
                     LOG.warn("Unable to add group member '%s' to group '%s'"
-                                     "; user does not exist.", member, name)
+                             "; user does not exist.", member, name)
                     continue
-                util.subp(['pw', 'usermod', '-n', name, '-G', member])
-                LOG.info("Added user '%s' to group '%s'", member, name)
+                try:
+                    util.subp(['pw', 'usermod', '-n', name, '-G', member])
+                    LOG.info("Added user '%s' to group '%s'", member, name)
+                except Exception:
+                    util.logexc(LOG, "Failed to add user '%s' to group '%s'",
+                                member, name)
 
     def add_user(self, name, **kwargs):
         if util.is_user(name):
@@ -230,15 +234,16 @@ class Distro(distros.Distro):
         util.write_file(self.login_conf_fn, newconf.getvalue())
 
         try:
-            util.logexc("Running cap_mkdb for %s", locale)
+            LOG.debug("Running cap_mkdb for %s", locale)
             util.subp(['cap_mkdb', self.login_conf_fn])
         except util.ProcessExecutionError:
             # cap_mkdb failed, so restore the backup.
-            util.logexc("Failed to apply locale %s", locale)
+            util.logexc(LOG, "Failed to apply locale %s", locale)
             try:
                 util.copy(self.login_conf_fn_bak, self.login_conf_fn)
             except IOError:
-                util.logexc("Failed to restore %s backup", self.login_conf_fn)
+                util.logexc(LOG, "Failed to restore %s backup",
+                            self.login_conf_fn)
 
     def install_packages(self, pkglist):
         return
-- 
cgit v1.2.3


From 15ebe2a01c0bcdaae43054e0e3559871a99f72aa Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Fri, 24 Jan 2014 17:39:51 -0800
Subject: Don't try to create members if group creation fails

---
 cloudinit/distros/freebsd.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py
index 0f1656c3..afb502c9 100644
--- a/cloudinit/distros/freebsd.py
+++ b/cloudinit/distros/freebsd.py
@@ -108,8 +108,9 @@ class Distro(distros.Distro):
             try:
                 util.subp(group_add_cmd)
                 LOG.info("Created new group %s", name)
-            except Exception:
+            except Exception as e:
                 util.logexc(LOG, "Failed to create group %s", name)
+                raise e
 
         if len(members) > 0:
             for member in members:
-- 
cgit v1.2.3