diff options
| author | hua zhang <zhhuabj@cn.ibm.com> | 2012-05-09 14:11:00 +0800 |
|---|---|---|
| committer | hua zhang <zhhuabj@cn.ibm.com> | 2012-05-14 17:12:29 +0800 |
| commit | 763a3678407b244b680fd0bf2c6bcee60e8352c2 (patch) | |
| tree | 09975f4e0cad91c5b27acf601c1fd370304fc083 /nova/compute | |
| parent | 2c7e0d1e63cae7aaa38095439843c9a2abb0382b (diff) | |
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
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
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'], |