From 268494769f0d9f82719f122161f0227372cb8824 Mon Sep 17 00:00:00 2001 From: Peng Yong Date: Sun, 15 Apr 2012 23:01:24 +0800 Subject: fix bug 982360, multi ip block for dmz_cidr Change-Id: I289110e70e3336704ffff24f1887669c11a559b9 --- nova/network/linux_net.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'nova') diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index fc33ebdcc..1503dd1f4 100755 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -60,9 +60,9 @@ linux_net_opts = [ cfg.StrOpt('dns_server', default=None, help='if set, uses specific dns server for dnsmasq'), - cfg.StrOpt('dmz_cidr', - default='10.128.0.0/24', - help='dmz range that should be accepted'), + cfg.ListOpt('dmz_cidr', + default=[], + help='A list of dmz range that should be accepted'), cfg.StrOpt('dnsmasq_config_file', default='', help='Override the default dnsmasq settings with this file'), @@ -445,9 +445,10 @@ def init_host(ip_range=None): '-s %s -d %s/32 -j ACCEPT' % (ip_range, FLAGS.metadata_host)) - iptables_manager.ipv4['nat'].add_rule('POSTROUTING', - '-s %s -d %s -j ACCEPT' % - (ip_range, FLAGS.dmz_cidr)) + for dmz in FLAGS.dmz_cidr: + iptables_manager.ipv4['nat'].add_rule('POSTROUTING', + '-s %s -d %s -j ACCEPT' % + (ip_range, dmz)) iptables_manager.ipv4['nat'].add_rule('POSTROUTING', '-s %(range)s -d %(range)s ' -- cgit