diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-06-15 22:54:29 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-06-15 22:54:29 -0400 |
| commit | cfbf95f531f4e637fc707478e4ebbb5af39db355 (patch) | |
| tree | 48b7bf1d110b4f4b35a8833ea83d0c9c54775268 /cloudinit/distros | |
| parent | 14271e89f3a2a6a813fc5aac7163da3defcfd4c1 (diff) | |
| parent | d4b587ebf500ddc2259fffc94a3c69c199c9a427 (diff) | |
| download | vyos-cloud-init-cfbf95f531f4e637fc707478e4ebbb5af39db355.tar.gz vyos-cloud-init-cfbf95f531f4e637fc707478e4ebbb5af39db355.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/distros')
| -rw-r--r-- | cloudinit/distros/__init__.py | 2 | ||||
| -rw-r--r-- | cloudinit/distros/arch.py | 4 |
2 files changed, 3 insertions, 3 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)): diff --git a/cloudinit/distros/arch.py b/cloudinit/distros/arch.py index 93a2e008..66209f22 100644 --- a/cloudinit/distros/arch.py +++ b/cloudinit/distros/arch.py @@ -196,6 +196,6 @@ def convert_resolv_conf(settings): """Returns a settings string formatted for resolv.conf.""" result = '' if isinstance(settings, list): - for ns in list: + for ns in settings: result = result + 'nameserver %s\n' % ns - return result + return result |