summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-19 15:19:01 +0000
committerGerrit Code Review <review@openstack.org>2013-01-19 15:19:01 +0000
commitcd4093e0f2a7d07fa81915dc4866f4ac7324a028 (patch)
treef2753fc1dd5402f9e73991e66dcae800448b3018
parent888de921ee6fd16dc15be1318311950e18311f10 (diff)
parent9503cf637c8971ba31fb6232dc1661b5092e04a0 (diff)
downloadnova-cd4093e0f2a7d07fa81915dc4866f4ac7324a028.tar.gz
nova-cd4093e0f2a7d07fa81915dc4866f4ac7324a028.tar.xz
nova-cd4093e0f2a7d07fa81915dc4866f4ac7324a028.zip
Merge "Remove network_host config option"
-rw-r--r--nova/network/manager.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 91b1c92d7..a7014520c 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -147,9 +147,6 @@ network_opts = [
cfg.BoolOpt('auto_assign_floating_ip',
default=False,
help='Autoassigning floating ip to VM'),
- cfg.StrOpt('network_host',
- default=socket.getfqdn(),
- help='Network host to use for ip allocation in flat modes'),
cfg.BoolOpt('fake_network',
default=False,
help='If passed, use fake network devices and addresses'),