diff options
| author | Scott Moser <smoser@brickies.net> | 2017-05-26 15:53:48 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-05-26 15:53:48 -0400 |
| commit | cc9748215f612b8c600c1080c60af71fe7624c47 (patch) | |
| tree | 3f008cb6350adf6bc003d2d5ad2d851c9506b81e /cloudinit/net/network_state.py | |
| parent | 3dd56b4504003928bace87a7e67b08e9376fc6c1 (diff) | |
| parent | 16a7302f6acb69adb0aee75eaf12392fa3688853 (diff) | |
| download | vyos-cloud-init-cc9748215f612b8c600c1080c60af71fe7624c47.tar.gz vyos-cloud-init-cc9748215f612b8c600c1080c60af71fe7624c47.zip | |
merge from master at 0.7.9-153-g16a7302f
Diffstat (limited to 'cloudinit/net/network_state.py')
| -rw-r--r-- | cloudinit/net/network_state.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py index db3c3579..9e9c05a0 100644 --- a/cloudinit/net/network_state.py +++ b/cloudinit/net/network_state.py @@ -734,9 +734,9 @@ def ipv6mask2cidr(mask): def mask2cidr(mask): - if ':' in mask: + if ':' in str(mask): return ipv6mask2cidr(mask) - elif '.' in mask: + elif '.' in str(mask): return ipv4mask2cidr(mask) else: return mask |