diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2015-04-07 19:34:40 +0000 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2015-04-13 07:34:12 +0000 |
| commit | ed107a5e26f35351a178c12eed5cd38c086409db (patch) | |
| tree | c4b0c9868d79e86d8c14b9f04cb054f645babcb9 /docker/nova-base | |
| parent | 2f2bb366e0aa856803c0d21a7a541802d814d180 (diff) | |
| download | kolla-ed107a5e26f35351a178c12eed5cd38c086409db.tar.gz kolla-ed107a5e26f35351a178c12eed5cd38c086409db.zip | |
Adds Neutron Agents Support
Previously, the agents ran in seperate containers. Since some of
the agents create and use network namespaces, runnning them in
seperate containers has become a challenge. This patch adds
neutron agent support in a single container.
Partially Implements: blueprint compute-operation-neutron
Change-Id: If4f893abd50d90b58e8435ec2659870dce36951c
Diffstat (limited to 'docker/nova-base')
| -rwxr-xr-x | docker/nova-base/config-nova.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index 0b1dc39d3..f8a9c44a5 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -90,7 +90,11 @@ elif [ "${NETWORK_MANAGER}" == "neutron" ] ; then crudini --set $cfg DEFAULT neutron_default_tenant_id default crudini --set $cfg DEFAULT network_api_class nova.network.neutronv2.api.API crudini --set $cfg DEFAULT security_group_api neutron - crudini --set $cfg DEFAULT linuxnet_interface_driver nova.network.linux_net.NeutronLinuxBridgeInterfaceDriver + if [[ "${MECHANISM_DRIVERS}" =~ .*linuxbridge* ]] ; then + crudini --set $cfg DEFAULT linuxnet_interface_driver nova.network.linux_net.NeutronLinuxBridgeInterfaceDriver + elif [[ "${MECHANISM_DRIVERS}" =~ .*openvswitch* ]] ; then + crudini --set $cfg DEFAULT linuxnet_interface_driver nova.network.linux_net.LinuxOVSInterfaceDriver + fi crudini --set $cfg DEFAULT libvirt_vif_driver nova.virt.libvirt.vif.LibvirtGenericVIFDriver crudini --set $cfg DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver crudini --set $cfg neutron url http://${NEUTRON_SERVER_SERVICE_HOST}:${NEUTRON_SERVER_SERVICE_PORT} |