summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbhijit Menon-Sen <abhijit@menon-sen.com>2016-08-25 15:47:08 +0530
committerGitHub <noreply@github.com>2016-08-25 15:47:08 +0530
commit1a62fe3874fe96b223e3cf12e3d8eeb4872dad2e (patch)
tree8a7e9c366bc7183bdd662e682f426e35ee677d02
parentacc8a13eff73d27977525e04454fe7e904484e6f (diff)
parentb4ed3a4f529b124b277639290d49d4edb334b2c7 (diff)
downloadansible-1a62fe3874fe96b223e3cf12e3d8eeb4872dad2e.tar.gz
Merge pull request #13739 from chrrrles/ipaddr_empty_string
ipaddr filter properly handle addresses on /31 networks
-rw-r--r--lib/ansible/plugins/filter/ipaddr.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ansible/plugins/filter/ipaddr.py b/lib/ansible/plugins/filter/ipaddr.py
index 23c3c7182b..20041e0da9 100644
--- a/lib/ansible/plugins/filter/ipaddr.py
+++ b/lib/ansible/plugins/filter/ipaddr.py
@@ -80,7 +80,8 @@ def _ip_query(v):
if v.size == 1:
return str(v.ip)
if v.size > 1:
- if v.ip != v.network:
+ # /31 networks in netaddr have no broadcast address
+ if v.ip != v.network or not v.broadcast:
return str(v.ip)
def _gateway_query(v):