diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:43 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:43 -0400 |
| commit | c00558f3159e0d1c54df3afa16ad8e06db6e30ab (patch) | |
| tree | 7450e4d94477db02910da4d5118521904c3a89e2 /cloudinit/sources/DataSourceSmartOS.py | |
| parent | 90ad4618fd49dae5e833d6ab4d16495911cd5cde (diff) | |
| parent | d86e75313524298e52469d4e55fa945ec731e938 (diff) | |
| download | vyos-cloud-init-c00558f3159e0d1c54df3afa16ad8e06db6e30ab.tar.gz vyos-cloud-init-c00558f3159e0d1c54df3afa16ad8e06db6e30ab.zip | |
merge trunk at 0.7.7~bzr1256
Diffstat (limited to 'cloudinit/sources/DataSourceSmartOS.py')
| -rw-r--r-- | cloudinit/sources/DataSourceSmartOS.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/sources/DataSourceSmartOS.py b/cloudinit/sources/DataSourceSmartOS.py index 08bc132b..ccc86883 100644 --- a/cloudinit/sources/DataSourceSmartOS.py +++ b/cloudinit/sources/DataSourceSmartOS.py @@ -718,8 +718,8 @@ def convert_smartos_network_data(network_data=None): config = [] for nic in network_data: - cfg = {k: v for k, v in nic.items() - if k in valid_keys['physical']} + cfg = dict((k, v) for k, v in nic.items() + if k in valid_keys['physical']) cfg.update({ 'type': 'physical', 'name': nic['interface']}) @@ -728,8 +728,8 @@ def convert_smartos_network_data(network_data=None): subnets = [] for ip, gw in zip(nic['ips'], nic['gateways']): - subnet = {k: v for k, v in nic.items() - if k in valid_keys['subnet']} + subnet = dict((k, v) for k, v in nic.items() + if k in valid_keys['subnet']) subnet.update({ 'type': 'static', 'address': ip, |