summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyu Ishimoto <ryu@midokura.jp>2011-07-21 02:57:52 +0900
committerRyu Ishimoto <ryu@midokura.jp>2011-07-21 02:57:52 +0900
commitcea17225c9a568e97f55287edf7510ebcfbae301 (patch)
tree23abbeade15d76a64d8aefff7496716d56535400
parent53506549e285ee85cb1911670a8ff24ccdd32d5c (diff)
Moved back allow_project_net_traffic to libvirt conn
-rw-r--r--nova/virt/libvirt/connection.py3
-rw-r--r--nova/virt/libvirt/vif.py3
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 3f6230e95..c2a867e30 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -96,6 +96,9 @@ flags.DEFINE_string('libvirt_uri',
'',
'Override the default libvirt URI (which is dependent'
' on libvirt_type)')
+flags.DEFINE_bool('allow_project_net_traffic',
+ True,
+ 'Whether to allow in project network traffic')
flags.DEFINE_bool('use_cow_images',
True,
'Whether to use cow images')
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index d35a3c8f6..3d9b234b8 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -25,9 +25,6 @@ from nova import utils
from nova.virt.vif import VIFDriver
FLAGS = flags.FLAGS
-flags.DEFINE_bool('allow_project_net_traffic',
- True,
- 'Whether to allow in project network traffic')
class LibvirtBridge(object):