Merge pull request #690 from jayapalu/vpn

CLOUDSTACK-8710: Fixed applying iptables rules for s2s vpn
@remibergsma @wilderrodrigues
Moved applying iptables rules apply after vpn configuration so that vpn specific rules also get applied

* pr/690:
  CLOUDSTACK-8710: Fixed applying iptables rules for s2s vpn

This closes #690

Signed-off-by: Remi Bergsma <github@remi.nl>
This commit is contained in:
Remi Bergsma 2015-08-14 09:10:28 +02:00
commit 7ddec661ca

View File

@ -678,9 +678,6 @@ def main(argv):
red = CsRedundant(config)
red.set()
nf = CsNetfilters()
nf.compare(config.get_fw())
vpns = CsSite2SiteVpn("site2sitevpn", config)
vpns.process()
@ -693,6 +690,9 @@ def main(argv):
mon = CsMonitor("monitorservice", config)
mon.process()
nf = CsNetfilters()
nf.compare(config.get_fw())
# Save iptables configuration - will be loaded on reboot by the iptables-restore that is configured on /etc/rc.local
CsHelper.save_iptables("iptables-save", "/etc/iptables/router_rules.v4")
CsHelper.save_iptables("ip6tables-save", "/etc/iptables/router_rules.v6")