Merge lp:~harlowja/cloud-init/fix-passwd into lp:~cloud-init-dev/cloud-init/trunk

[Joshua Harlow]

[Scott Moser (smoser)]

I dont have a good explanation for why system accounts would differ from non-system accounts with reguard to 'lock_passwd'. So, I'm just going to simplify this to:
+ # Default locking down the account. 'lock_passwd' defaults to True.
+ # lock account unless lock_password is False.
+ if kwargs.get('lock_passwd', True):

My simple test on 12.04 shows that 'passwd -l USER' works fine even if user's entry in /etc/shadow has '*' (which means 'no password').

=== modified file 'cloudinit/distros/__init__.py'
--- cloudinit/distros/__init__.py	2012-11-20 06:04:31 +0000
+++ cloudinit/distros/__init__.py	2013-01-05 18:20:27 +0000
@@ -335,9 +335,10 @@
             self.set_passwd(name, kwargs['plain_text_passwd'])
 
         # Default locking down the account.
-        if ('lock_passwd' not in kwargs and
-            ('lock_passwd' in kwargs and kwargs['lock_passwd']) or
-            'system' not in kwargs):
+        #
+        # Which means if lock_passwd is False (on non-existent its true)
+        # then lock or if system is True (on non-existent its false) then lock.
+        if (kwargs.get('lock_passwd', True) or kwargs.get('system', False)):
             try:
                 util.subp(['passwd', '--lock', name])
             except Exception as e: