diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-14 18:58:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-14 18:58:07 +0000 |
| commit | b3e2bae38177583201dd7dcdd2d9c16929724573 (patch) | |
| tree | 019cee393ee41f68025dc02095f0b804320306ce /nova/compute | |
| parent | 0e09b3357bf0fbce93a51996dec1ce5a7b93b859 (diff) | |
| parent | 763a3678407b244b680fd0bf2c6bcee60e8352c2 (diff) | |
Merge "Avoid setting up DHCP firewall rules with FlatManager"
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'], |