etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iptreemap is not supported in new ipset, use iphash instead

This commit is contained in:
Anthony Xu 2014-08-25 11:22:30 -07:00
parent 7e15d16185
commit bd6f03aa95
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/vm/hypervisor/xenserver/vmops
View File

@ -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])