summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_ssh_import_id.py
diff options
context:
space:
mode:
Diffstat (limited to 'cloudinit/config/cc_ssh_import_id.py')
-rw-r--r--cloudinit/config/cc_ssh_import_id.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/cloudinit/config/cc_ssh_import_id.py b/cloudinit/config/cc_ssh_import_id.py
index c58b28ec..f18e1fc5 100644
--- a/cloudinit/config/cc_ssh_import_id.py
+++ b/cloudinit/config/cc_ssh_import_id.py
@@ -32,7 +32,12 @@ def handle(name, cfg, _cloud, log, args):
if len(args) > 1:
ids = args[1:]
else:
- user = util.get_cfg_option_str(cfg, "user", "ubuntu")
+ try:
+ user = cloud.distro.get_default_username()
+ except NotImplementedError:
+ pass
+
+ user = None
ids = util.get_cfg_option_list(cfg, "ssh_import_id", [])
if len(ids) == 0: