x/packstack
Code Issues Proposed changes

Merge "Set vif_driver when using quantum/ovs"

Browse Source
This commit is contained in:
Jenkins
2013-05-29 21:27:37 +00:00
committed by Gerrit Code Review
parent 41ed31f1df 39553e8c40
commit 0beb575244
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packstack/plugins/nova_300.py
View File

@@ -434,6 +434,11 @@ def createquantummanifest(config):
if controller.CONF['CONFIG_QUANTUM_INSTALL'] != "y":
return
if controller.CONF['CONFIG_QUANTUM_L2_PLUGIN'] == 'openvswitch':
controller.CONF['CONFIG_NOVA_LIBVIRT_VIF_DRIVER'] = 'nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver'
else:
controller.CONF['CONFIG_NOVA_LIBVIRT_VIF_DRIVER'] = 'nova.virt.libvirt.vif.LibvirtGenericVIFDriver'
for manifestfile, marker in manifestfiles.getFiles():
if manifestfile.endswith("_nova.pp"):
data = getManifestTemplate("nova_quantum.pp")

2
packstack/puppet/templates/nova_quantum.pp
View File

@@ -8,5 +8,5 @@ class {"nova::network::quantum":
}
class {"nova::compute::quantum":
libvirt_vif_driver => "nova.virt.libvirt.vif.LibvirtGenericVIFDriver",
libvirt_vif_driver => "%(CONFIG_NOVA_LIBVIRT_VIF_DRIVER)s",
}