diff options
| author | Chad Smith <chad.smith@canonical.com> | 2017-12-01 10:04:25 -0700 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2017-12-01 10:04:25 -0700 |
| commit | 9824cecf6d644093c5083ab2d550a58d18d207b0 (patch) | |
| tree | 2a944c65afc7379211ffa6ce0b2f0841bded4c5a /cloudinit/net/network_state.py | |
| parent | d4dfa39f8c2d6e386303cbe6abb9bb1f804cae5f (diff) | |
| parent | 7acc9e68fafbbd7c56587aebe752ba6ba8c8a3db (diff) | |
| download | vyos-cloud-init-9824cecf6d644093c5083ab2d550a58d18d207b0.tar.gz vyos-cloud-init-9824cecf6d644093c5083ab2d550a58d18d207b0.zip | |
merge from master at 17.1-46-g7acc9e68
Diffstat (limited to 'cloudinit/net/network_state.py')
| -rw-r--r-- | cloudinit/net/network_state.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py index 0e830ee8..e9e2cf4e 100644 --- a/cloudinit/net/network_state.py +++ b/cloudinit/net/network_state.py @@ -746,6 +746,14 @@ def _normalize_subnet(subnet): _normalize_net_keys(normal_subnet, address_keys=('address',))) normal_subnet['routes'] = [_normalize_route(r) for r in subnet.get('routes', [])] + + def listify(snet, name): + if name in snet and not isinstance(snet[name], list): + snet[name] = snet[name].split() + + for k in ('dns_search', 'dns_nameservers'): + listify(normal_subnet, k) + return normal_subnet |