summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Andrews <jesse@gigantor.local>2010-08-24 21:59:41 -0400
committerJesse Andrews <jesse@gigantor.local>2010-08-24 21:59:41 -0400
commit09bd4fafdba2216e0cf7e0771f0c2bc261c2ef02 (patch)
tree510e9f421583cbc296f7765c4604cd2f0f8f41d7
parentaffa9384e8f948f61d51672c42e131e34193b87d (diff)
parent3760ea4635174c26baeb5ba906621ff1abb2459f (diff)
downloadnova-09bd4fafdba2216e0cf7e0771f0c2bc261c2ef02.tar.gz
nova-09bd4fafdba2216e0cf7e0771f0c2bc261c2ef02.tar.xz
nova-09bd4fafdba2216e0cf7e0771f0c2bc261c2ef02.zip
merge vish
-rw-r--r--nova/network/service.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/network/service.py b/nova/network/service.py
index baaaff521..5590cce99 100644
--- a/nova/network/service.py
+++ b/nova/network/service.py
@@ -31,7 +31,7 @@ from nova.network import linux_net
FLAGS = flags.FLAGS
flags.DEFINE_string('network_type',
- 'flat',
+ 'vlan',
'Service Class for Networking')
flags.DEFINE_string('flat_network_bridge', 'br100',
'Bridge for simple network instances')