Chad has uploaded a new change for review. https://gerrit.wikimedia.org/r/191357
Change subject: es-tool: support IPv6 addresses in (un)ban-node ...................................................................... es-tool: support IPv6 addresses in (un)ban-node Change-Id: I46664fbcefab6726137e6814e3722840db359745 --- M modules/elasticsearch/files/es-tool 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/57/191357/1 diff --git a/modules/elasticsearch/files/es-tool b/modules/elasticsearch/files/es-tool index e5e27cd..786969f 100755 --- a/modules/elasticsearch/files/es-tool +++ b/modules/elasticsearch/files/es-tool @@ -78,7 +78,11 @@ ipaddr.IPv4Address(args.node) node_type = "_ip" except ipaddr.AddressValueError: - node_type = "_host" + try: + ipaddr.IPv6Address(args.node) + node_type = "_ip" + except ipaddr.AddressValueError: + node_type = "_host" banned = get_banned_nodes(node_type) if args.node in banned: @@ -196,7 +200,11 @@ ipaddr.IPv4Address(args.node) node_type = "_ip" except ipaddr.AddressValueError: - node_type = "_host" + try: + ipaddr.IPv6Address(args.node) + node_type = "_ip" + except ipaddr.AddressValueError: + node_type = "_host" banned = get_banned_nodes(node_type) if args.node not in banned: -- To view, visit https://gerrit.wikimedia.org/r/191357 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46664fbcefab6726137e6814e3722840db359745 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Chad <ch...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits