From bd6f03aa954d4b3e7ead7e8010c5674d5d1f9513 Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Mon, 25 Aug 2014 11:22:30 -0700 Subject: [PATCH] iptreemap is not supported in new ipset, use iphash instead --- scripts/vm/hypervisor/xenserver/vmops | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index 539d7decd47..cf9d3773a9a 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -373,7 +373,7 @@ def allow_egress_traffic(session): def ipset(ipsetname, proto, start, end, ips): try: - util.pread2(['ipset', '-N', ipsetname, 'iptreemap']) + util.pread2(['ipset', '-N', ipsetname, 'iphash']) except: logging.debug("ipset chain already exists" + ipsetname) @@ -381,7 +381,7 @@ def ipset(ipsetname, proto, start, end, ips): ipsettmp = ''.join(''.join(ipsetname.split('-')).split('_')) + str(int(time.time()) % 1000) try: - util.pread2(['ipset', '-N', ipsettmp, 'iptreemap']) + util.pread2(['ipset', '-N', ipsettmp, 'iphash']) except: logging.debug("Failed to create temp ipset, reusing old name= " + ipsettmp) try: @@ -1272,7 +1272,7 @@ def inflate_rules (zipped): def cache_ipset_keyword(): tmpname = 'ipsetqzvxtmp' try: - util.pread2(['/bin/bash', '-c', 'ipset -N ' + tmpname + ' iptreemap']) + util.pread2(['/bin/bash', '-c', 'ipset -N ' + tmpname + ' iphash']) except: util.pread2(['/bin/bash', '-c', 'ipset -F ' + tmpname])