openstack/devstack
Code Issues Proposed changes

Make tempest L3 capable plugin aware.

Browse Source 
With this patch, the public network config in tempest.conf will be
done for the plugins that support L3.

Change-Id: I820fe300fac45ff92d1281ff0c43ebc137783210
This commit is contained in:
Tomoe Sugihara 2013-11-14 20:02:47 +00:00
parent 3ae26652af
commit afbc631cb8
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/neutron
View File

@ -115,6 +115,13 @@ Q_ROUTER_NAME=${Q_ROUTER_NAME:-router1}
# nova vif driver that all plugins should use # nova vif driver that all plugins should use
NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"} NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
# The next two variables are configured by plugin
# e.g. _configure_neutron_l3_agent or lib/neutron_plugins/*
#
# The plugin supports L3.
Q_L3_ENABLED=${Q_L3_ENABLED:-False}
# L3 routers exist per tenant
Q_L3_ROUTER_PER_TENANT=${Q_L3_ROUTER_PER_TENANT:-False}
# List of config file names in addition to the main plugin config file # List of config file names in addition to the main plugin config file
# See _configure_neutron_common() for details about setting it up # See _configure_neutron_common() for details about setting it up

3
lib/tempest
View File

@ -15,6 +15,7 @@
# - ``PUBLIC_NETWORK_NAME`` # - ``PUBLIC_NETWORK_NAME``
# - ``Q_USE_NAMESPACE`` # - ``Q_USE_NAMESPACE``
# - ``Q_ROUTER_NAME`` # - ``Q_ROUTER_NAME``
# - ``Q_L3_ENABLED``
# - ``VIRT_DRIVER`` # - ``VIRT_DRIVER``
# - ``LIBVIRT_TYPE`` # - ``LIBVIRT_TYPE``
# - ``KEYSTONE_SERVICE_PROTOCOL``, ``KEYSTONE_SERVICE_HOST`` from lib/keystone # - ``KEYSTONE_SERVICE_PROTOCOL``, ``KEYSTONE_SERVICE_HOST`` from lib/keystone
@ -200,7 +201,7 @@ function configure_tempest() {
ssh_connect_method=${TEMPEST_SSH_CONNECT_METHOD:-$ssh_connect_method} ssh_connect_method=${TEMPEST_SSH_CONNECT_METHOD:-$ssh_connect_method}
if is_service_enabled q-l3; then if [ "$Q_L3_ENABLED" = "True" ]; then
public_network_id=$(neutron net-list | grep $PUBLIC_NETWORK_NAME | \ public_network_id=$(neutron net-list | grep $PUBLIC_NETWORK_NAME | \
awk '{print $2}') awk '{print $2}')
if [ "$Q_USE_NAMESPACE" == "False" ]; then if [ "$Q_USE_NAMESPACE" == "False" ]; then