Browse code
Merge "Quantum: use generic VIF driver"
Jenkins authored on 2013/03/13 08:58:34Showing 5 changed files
- lib/quantum_plugins/README.md
- lib/quantum_plugins/bigswitch_floodlight
- lib/quantum_plugins/brocade
- lib/quantum_plugins/linuxbridge
- lib/quantum_plugins/openvswitch
| ... | ... |
@@ -18,7 +18,7 @@ functions |
| 18 | 18 |
* ``quantum_plugin_create_nova_conf`` : |
| 19 | 19 |
set ``NOVA_VIF_DRIVER`` and optionally set options in nova_conf |
| 20 | 20 |
e.g. |
| 21 |
- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver"}
|
|
| 21 |
+ NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
|
| 22 | 22 |
* ``quantum_plugin_install_agent_packages`` : |
| 23 | 23 |
install packages that is specific to plugin agent |
| 24 | 24 |
e.g. |
| ... | ... |
@@ -9,7 +9,7 @@ source $TOP_DIR/lib/quantum_plugins/ovs_base |
| 9 | 9 |
source $TOP_DIR/lib/quantum_thirdparty/bigswitch_floodlight # for third party service specific configuration values |
| 10 | 10 |
|
| 11 | 11 |
function quantum_plugin_create_nova_conf() {
|
| 12 |
- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver"}
|
|
| 12 |
+ NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
|
| 13 | 13 |
} |
| 14 | 14 |
|
| 15 | 15 |
function quantum_plugin_install_agent_packages() {
|
| ... | ... |
@@ -10,7 +10,7 @@ function is_quantum_ovs_base_plugin() {
|
| 10 | 10 |
} |
| 11 | 11 |
|
| 12 | 12 |
function quantum_plugin_create_nova_conf() {
|
| 13 |
- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.QuantumLinuxBridgeVIFDriver"}
|
|
| 13 |
+ NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
|
| 14 | 14 |
} |
| 15 | 15 |
|
| 16 | 16 |
function quantum_plugin_install_agent_packages() {
|
| ... | ... |
@@ -11,7 +11,7 @@ function is_quantum_ovs_base_plugin() {
|
| 11 | 11 |
} |
| 12 | 12 |
|
| 13 | 13 |
function quantum_plugin_create_nova_conf() {
|
| 14 |
- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.QuantumLinuxBridgeVIFDriver"}
|
|
| 14 |
+ NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
|
| 15 | 15 |
} |
| 16 | 16 |
|
| 17 | 17 |
function quantum_plugin_install_agent_packages() {
|
| ... | ... |
@@ -8,7 +8,7 @@ set +o xtrace |
| 8 | 8 |
source $TOP_DIR/lib/quantum_plugins/ovs_base |
| 9 | 9 |
|
| 10 | 10 |
function quantum_plugin_create_nova_conf() {
|
| 11 |
- NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver"}
|
|
| 11 |
+ NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
|
| 12 | 12 |
if [ "$VIRT_DRIVER" = 'xenserver' ]; then |
| 13 | 13 |
iniset $NOVA_CONF DEFAULT xenapi_vif_driver nova.virt.xenapi.vif.XenAPIOpenVswitchDriver |
| 14 | 14 |
iniset $NOVA_CONF DEFAULT xenapi_ovs_integration_bridge $FLAT_NETWORK_BRIDGE |