You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2017/11/20 08:06:34 UTC
[GitHub] bwsw commented on a change in pull request #2320: Hotfixes to make 4.10 KVM agent work
bwsw commented on a change in pull request #2320: Hotfixes to make 4.10 KVM agent work
URL: https://github.com/apache/cloudstack/pull/2320#discussion_r151922053
##########
File path: scripts/vm/network/security_group.py
##########
@@ -1039,21 +1051,27 @@ def add_network_rules(vm_name, vm_id, vm_ip, vm_ip6, signature, seqno, vmMac, ru
range = 'any'
for ip in rule['ipv4']:
- if protocol == 'all':
- execute('iptables -I ' + vmchain + ' -m state --state NEW ' + direction + ' ' + ip + ' -j ' + action)
- elif protocol != 'icmp':
- execute('iptables -I ' + vmchain + ' -p ' + protocol + ' -m ' + protocol + ' --dport ' + range + ' -m state --state NEW ' + direction + ' ' + ip + ' -j ' + action)
- else:
- execute('iptables -I ' + vmchain + ' -p icmp --icmp-type ' + range + ' ' + direction + ' ' + ip + ' -j ' + action)
-
+ try:
+ if protocol == 'all':
+ execute('iptables -I ' + vmchain + ' -m state --state NEW ' + direction + ' ' + ip + ' -j ' + action)
+ elif protocol != 'icmp':
+ execute('iptables -I ' + vmchain + ' -p ' + protocol + ' -m ' + protocol + ' --dport ' + range + ' -m state --state NEW ' + direction + ' ' + ip + ' -j ' + action)
+ else:
+ execute('iptables -I ' + vmchain + ' -p icmp --icmp-type ' + range + ' ' + direction + ' ' + ip + ' -j ' + action)
+ except:
+ pass
Review comment:
@rhtyd I believe the code should be improved before inclusion to master, but I believe it should be done in management server side, because agent is too far from API to do it correctly. But warning is probably a good thing. I don't remember why excluded, but probably because 'execute' includes debug.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services