cloud-init-dev team mailing list archive

[Serg Lystopad <slystopad@xxxxxxxxxxxx>]

Serg Lystopad has proposed merging ~slystopad/cloud-init:merge/chpasswd-data-as-list into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1665694 in cloud-init: "cc_set_passwords fails to change passwords specified as chpasswd['list'] in cloud-config"
  https://bugs.launchpad.net/cloud-init/+bug/1665694
  Bug #1665773 in cloud-init: "wrong configuration example for cc_set_passwords module"
  https://bugs.launchpad.net/cloud-init/+bug/1665773

For more details, see:
https://code.launchpad.net/~slystopad/cloud-init/+git/cloud-init/+merge/317774
-- 
Your team cloud init development team is requested to review the proposed merge of ~slystopad/cloud-init:merge/chpasswd-data-as-list into cloud-init:master.

diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py
index cf1f59e..60fe7d1 100755
--- a/cloudinit/config/cc_set_passwords.py
+++ b/cloudinit/config/cc_set_passwords.py
@@ -50,6 +50,17 @@ enabled, disabled, or left to system defaults using ``ssh_pwauth``.
             - user2:Random
             - user3:password3
             - user4:R
+
+    ##
+    # or as multiline string
+    ##
+    chpasswd:
+        list: |
+            user1:password1
+            user2:Random
+            user3:password3
+            user4:R
+
 """
 
 import sys
@@ -79,7 +90,14 @@ def handle(_name, cfg, cloud, log, args):
 
     if 'chpasswd' in cfg:
         chfg = cfg['chpasswd']
-        plist = util.get_cfg_option_str(chfg, 'list', plist)
+        if type(chfg['list']) == type([]):
+            cfg_type='list'
+        else:
+            cfg_type='string'
+        if cfg_type == 'list':
+            plist = util.get_cfg_option_list(chfg, 'list', plist)
+        else:
+            plist = util.get_cfg_option_str(chfg, 'list', plist)
         expire = util.get_cfg_option_bool(chfg, 'expire', expire)
 
     if not plist and password:
@@ -95,13 +113,26 @@ def handle(_name, cfg, cloud, log, args):
         plist_in = []
         randlist = []
         users = []
-        for line in plist.splitlines():
+        def _prepare_credentials(line, **kwargs):
             u, p = line.split(':', 1)
             if p == "R" or p == "RANDOM":
                 p = rand_user_password()
-                randlist.append("%s:%s" % (u, p))
-            plist_in.append("%s:%s" % (u, p))
-            users.append(u)
+                kwargs['randlist'].append("%s:%s" % (u, p))
+            kwargs['plist_in'].append("%s:%s" % (u, p))
+            kwargs['users'].append(u)
+
+        if cfg_type == 'list':
+            log.warn("Handling input for chpasswd as list.")
+            for line in plist:
+                _prepare_credentials(line, randlist=randlist,
+                                           plist_in=plist_in,
+                                           users=users)
+        else:
+            log.warn("Handling input for chpasswd as multiline string.")
+            for line in plist.splitlines():
+                _prepare_credentials(line, randlist=randlist,
+                                           plist_in=plist_in,
+                                           users=users)
 
         ch_in = '\n'.join(plist_in) + '\n'
         try: