diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-07-13 22:45:19 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-07-13 22:45:19 -0400 |
| commit | 7b4eef8f57ffb02c3851c7bfc36d614ebab8f341 (patch) | |
| tree | e7216eaf283bdcbe233939ccf1c154b90150fc49 /cloudinit/sources/helpers | |
| parent | 150d064b5693c7a287790900923b9413fe6d73dd (diff) | |
| parent | 22a93665b90fa7fba80946d690330eda890f50d4 (diff) | |
| download | vyos-cloud-init-7b4eef8f57ffb02c3851c7bfc36d614ebab8f341.tar.gz vyos-cloud-init-7b4eef8f57ffb02c3851c7bfc36d614ebab8f341.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/sources/helpers')
| -rw-r--r-- | cloudinit/sources/helpers/openstack.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py index d52cb56a..2e7a1d47 100644 --- a/cloudinit/sources/helpers/openstack.py +++ b/cloudinit/sources/helpers/openstack.py @@ -542,8 +542,8 @@ def convert_net_json(network_json=None, known_macs=None): config = [] for link in links: subnets = [] - cfg = {k: v for k, v in link.items() - if k in valid_keys['physical']} + cfg = dict((k, v) for k, v in link.items() + if k in valid_keys['physical']) # 'name' is not in openstack spec yet, but we will support it if it is # present. The 'id' in the spec is currently implemented as the host # nic's name, meaning something like 'tap-adfasdffd'. We do not want @@ -553,8 +553,8 @@ def convert_net_json(network_json=None, known_macs=None): for network in [n for n in networks if n['link'] == link['id']]: - subnet = {k: v for k, v in network.items() - if k in valid_keys['subnet']} + subnet = dict((k, v) for k, v in network.items() + if k in valid_keys['subnet']) if 'dhcp' in network['type']: t = 'dhcp6' if network['type'].startswith('ipv6') else 'dhcp4' subnet.update({ |