Merge lp:~harmw/cloud-init/freebsd-fixes into lp:~cloud-init-dev/cloud-init/trunk

[Harm Weites]

Use the regular logic to create sudo rules and just supply the correct filename. The temp script in tools/ should install 2 more dependencies, so make it do that.

=== modified file 'cloudinit/distros/freebsd.py'
--- cloudinit/distros/freebsd.py	2014-08-28 17:54:00 +0000
+++ cloudinit/distros/freebsd.py	2014-09-03 17:23:52 +0000
@@ -37,6 +37,7 @@
     login_conf_fn = '/etc/login.conf'
     login_conf_fn_bak = '/etc/login.conf.orig'
     resolv_conf_fn = '/etc/resolv.conf'
+    ci_sudoers_fn = '/usr/local/etc/sudoers.d/90-cloud-init-users'
 
     def __init__(self, name, cfg, paths):
         distros.Distro.__init__(self, name, cfg, paths)
@@ -219,10 +220,6 @@
             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)
 
 
=== modified file 'tools/build-on-freebsd'
--- tools/build-on-freebsd	2014-08-23 12:16:03 +0000
+++ tools/build-on-freebsd	2014-09-03 17:23:52 +0000
@@ -17,6 +17,7 @@
    py27-prettytable
    py27-requests py27-six
    python py27-cheetah
+   py27-jsonpointer py27-jsonpatch
 "
 [ -f "$depschecked" ] || pkg install ${pkgs} || fail "install packages"
 touch $depschecked