From 763a3678407b244b680fd0bf2c6bcee60e8352c2 Mon Sep 17 00:00:00 2001 From: hua zhang Date: Wed, 9 May 2012 14:11:00 +0800 Subject: Avoid setting up DHCP firewall rules with FlatManager Fixes bug #704737 With FlatManager, ensure that the network info's dhcp_server value is not set and use that key to decide in the compute service whether DHCP firewall rules should be added. Change-Id: I8183a6fa3881adea1a09f3f1a29442e6b7a919ce --- nova/compute/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/utils.py b/nova/compute/utils.py index c00626129..7a6ac8671 100644 --- a/nova/compute/utils.py +++ b/nova/compute/utils.py @@ -186,7 +186,7 @@ def legacy_network_info(network_model): False) should_create_vlan = get_meta(network, 'should_create_vlan', False) gateway = get_ip(subnet_v4['gateway']) - dhcp_server = get_meta(subnet_v4, 'dhcp_server', gateway) + dhcp_server = get_meta(subnet_v4, 'dhcp_server') network_dict = dict(bridge=network['bridge'], id=network['id'], cidr=subnet_v4['cidr'], -- cgit