summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2017-03-10 12:39:30 -0500
committerScott Moser <smoser@brickies.net>2017-03-10 12:57:03 -0500
commit75a421521153cacd01f6e9df83096f82475e8b08 (patch)
treecc2c29369b3b193e91b702c88a7650b7def16103
parent021ed9c960484dcb45941d48139ec86c2ce1f248 (diff)
downloadvyos-cloud-init-75a421521153cacd01f6e9df83096f82475e8b08.tar.gz
vyos-cloud-init-75a421521153cacd01f6e9df83096f82475e8b08.zip
Further fix regression to support 'password' for default user.
The adjusted change did not support #cloud-config password: passw0rd This correctly fixes that regression.
-rwxr-xr-xcloudinit/config/cc_set_passwords.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py
index f36f7745..16117048 100755
--- a/cloudinit/config/cc_set_passwords.py
+++ b/cloudinit/config/cc_set_passwords.py
@@ -105,7 +105,7 @@ def handle(_name, cfg, cloud, log, args):
(users, _groups) = ug_util.normalize_users_groups(cfg, cloud.distro)
(user, _user_config) = ug_util.extract_default(users)
if user:
- plist = "%s:%s" % (user, password)
+ plist = ["%s:%s" % (user, password)]
else:
log.warn("No default or defined user to change password for.")