diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-06-15 23:28:51 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-06-15 23:28:51 -0400 |
| commit | a066f95c67bb5fa15350cdff319f60d589274c3a (patch) | |
| tree | 790d277e08dd39da82dd956c89709e17538a1a82 /cloudinit/distros/__init__.py | |
| parent | a454a6408b3c7ecc816073049d060632191099bb (diff) | |
| parent | d598ceeb838b4ccaf667ded84bb02bf096ab7b12 (diff) | |
| download | vyos-cloud-init-a066f95c67bb5fa15350cdff319f60d589274c3a.tar.gz vyos-cloud-init-a066f95c67bb5fa15350cdff319f60d589274c3a.zip | |
merge with trunk
Diffstat (limited to 'cloudinit/distros/__init__.py')
| -rw-r--r-- | cloudinit/distros/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index 5c29c804..14b500f8 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -454,7 +454,7 @@ class Distro(object): keys = kwargs['ssh_authorized_keys'] if isinstance(keys, six.string_types): keys = [keys] - if isinstance(keys, dict): + elif isinstance(keys, dict): keys = list(keys.values()) if keys is not None: if not isinstance(keys, (tuple, list, set)): |