summaryrefslogtreecommitdiff
path: root/cloudinit/config
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-08-22 23:38:20 -0400
committerScott Moser <smoser@ubuntu.com>2012-08-22 23:38:20 -0400
commitbbbaeca0c375dc166ef8ffe0598d5f384b722c00 (patch)
treee9f6eae632f7cd29d483d0af2daec181b5d26a1b /cloudinit/config
parent700cb1a5d568dae2ecc8a9620874cebca97536a5 (diff)
downloadvyos-cloud-init-bbbaeca0c375dc166ef8ffe0598d5f384b722c00.tar.gz
vyos-cloud-init-bbbaeca0c375dc166ef8ffe0598d5f384b722c00.zip
cc_ssh.py: add the "get user zero" logic, disable root even if no user
cc_ssh.py was getting user of None, which ended up with a root user not getting ssh keys updated. That was bad. So, I duplicated the "get user zero" code that appeared other places here. Then, we disable the root user even if there is not a user. In that case we just use the string "NONE" in the disable message.
Diffstat (limited to 'cloudinit/config')
-rw-r--r--cloudinit/config/cc_ssh.py15
1 files changed, 13 insertions, 2 deletions
diff --git a/cloudinit/config/cc_ssh.py b/cloudinit/config/cc_ssh.py
index 3431bd2a..439c8eb8 100644
--- a/cloudinit/config/cc_ssh.py
+++ b/cloudinit/config/cc_ssh.py
@@ -102,7 +102,16 @@ def handle(_name, cfg, cloud, log, _args):
" %s to file %s"), keytype, keyfile)
try:
- user = util.get_cfg_option_str(cfg, 'user')
+ # TODO(utlemming): consolidate this stanza that occurs in:
+ # cc_ssh_import_id, cc_set_passwords, maybe cc_users_groups.py
+ user = cloud.distro.get_default_user()
+
+ if 'users' in cfg:
+ user_zero = cfg['users'].keys()[0]
+
+ if user_zero != "default":
+ user = user_zero
+
disable_root = util.get_cfg_option_bool(cfg, "disable_root", True)
disable_root_opts = util.get_cfg_option_str(cfg, "disable_root_opts",
DISABLE_ROOT_OPTS)
@@ -124,7 +133,9 @@ def apply_credentials(keys, user, paths, disable_root, disable_root_opts):
if user:
ssh_util.setup_user_keys(keys, user, '', paths)
- if disable_root and user:
+ if disable_root:
+ if not user:
+ user = "NONE"
key_prefix = disable_root_opts.replace('$USER', user)
else:
key_prefix = ''