Merge lp:~andatche/cloud-init/freebsd-improvements into lp:~cloud-init-dev/cloud-init/trunk

[Ben Arblaster]

=== modified file 'cloudinit/distros/freebsd.py'
--- cloudinit/distros/freebsd.py	2015-11-24 10:46:14 +0000
+++ cloudinit/distros/freebsd.py	2015-11-24 10:46:15 +0000
@@ -244,9 +244,21 @@
             util.logexc(LOG, "Failed to create user %s", name)
             raise e
 
-    # TODO:
     def set_passwd(self, user, passwd, hashed=False):
-        return False
+        cmd = ['pw', 'usermod', user]
+
+        if hashed:
+            cmd.append('-H')
+        else:
+            cmd.append('-h')
+
+        cmd.append('0')
+
+        try:
+            util.subp(cmd, passwd, logstring="chpasswd for %s" % user)
+        except Exception as e:
+            util.logexc(LOG, "Failed to set password for %s", user)
+            raise e
 
     def lock_passwd(self, name):
         try:
@@ -400,10 +412,10 @@
         cmd.extend(pkglist)
 
         # Allow the output of this to flow outwards (ie not be captured)
-        util.subp(cmd, env=e, capture=False)	
+        util.subp(cmd, env=e, capture=False)
 
     def set_timezone(self, tz):
-        return
+        distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
 
     def update_package_sources(self):
         self._runner.run("update-sources", self.package_command,
 
=== modified file 'config/cloud.cfg-freebsd'
--- config/cloud.cfg-freebsd	2014-10-08 13:37:05 +0000
+++ config/cloud.cfg-freebsd	2015-11-24 10:46:15 +0000
@@ -49,10 +49,10 @@
 # - mounts
  - ssh-import-id
  - locale
-# - set-passwords
-# - package-update-upgrade-install
+ - set-passwords
+ - package-update-upgrade-install
 # - landscape
-# - timezone
+ - timezone
 # - puppet
 # - chef
 # - salt-minion
@@ -80,9 +80,9 @@
 system_info:
    distro: freebsd
    default_user:
-     name: beastie
+     name: freebsd
      lock_passwd: True
      gecos: FreeBSD
      groups: [wheel]
      sudo: ["ALL=(ALL) NOPASSWD:ALL"]
-     shell: /bin/sh
+     shell: /bin/tcsh