x/tap-as-a-service-tempest-plugin
Code Issues Proposed changes

Merge "devstack: Stop using Q_PLUGIN_EXTRA_CONF_FILES"

Browse Source
This commit is contained in:
Jenkins 2017-02-07 23:58:46 +00:00 committed by Gerrit Code Review
commit b4be9ed2c8
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/README.rst
View File

@ -8,6 +8,4 @@ A `local.conf` recipe to enable tap-as-a-service::
enable_plugin tap-as-a-service https://github.com/openstack/tap-as-a-service
enable_service taas
enable_service taas_openvswitch_agent
Q_PLUGIN_EXTRA_CONF_PATH=/etc/neutron
Q_PLUGIN_EXTRA_CONF_FILES=(taas_plugin.ini)
TAAS_SERVICE_DRIVER=TAAS:TAAS:neutron_taas.services.taas.service_drivers.taas_rpc.TaasRpcDriver:default

4
devstack/devstackgaterc
View File

@ -27,10 +27,6 @@ OVERRIDE_ENABLED_SERVICES+=,taas,taas_openvswitch_agent
OVERRIDE_ENABLED_SERVICES+=,tempest,dstat
export OVERRIDE_ENABLED_SERVICES
# Set config file
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN_EXTRA_CONF_PATH=/etc/neutron"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN_EXTRA_CONF_FILES=(taas_plugin.ini)"
# Begin list of exclusions.
r="^(?!.*"

1
devstack/plugin.sh
View File

@ -27,6 +27,7 @@ function configure_taas_plugin {
_create_neutron_conf_dir
fi
cp $TAAS_PLUGIN_PATH/etc/taas_plugin.ini $TAAS_PLUGIN_CONF_FILE
neutron_server_config_add $TAAS_PLUGIN_CONF_FILE
_neutron_service_plugin_class_add taas
}