openstack/tap-as-a-service
Code Issues Proposed changes

devstack: Stop using Q_PLUGIN_EXTRA_CONF_FILES

Browse Source 
Related-Bug: #1599936
Change-Id: I2ee08c9018bfd007013eb7d62c5264272faf379b
This commit is contained in:
Abhishek Raut 2016-07-10 02:39:46 -07:00
parent 447ce96f3d
commit 1ee06af471
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_plugin tap-as-a-service https://github.com/openstack/tap-as-a-service
enable_service taas enable_service taas
enable_service taas_openvswitch_agent 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 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 OVERRIDE_ENABLED_SERVICES+=,tempest,dstat
export OVERRIDE_ENABLED_SERVICES 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. # Begin list of exclusions.
r="^(?!.*" r="^(?!.*"

1
devstack/plugin.sh
View File

@ -27,6 +27,7 @@ function configure_taas_plugin {
_create_neutron_conf_dir _create_neutron_conf_dir
fi fi
cp $TAAS_PLUGIN_PATH/etc/taas_plugin.ini $TAAS_PLUGIN_CONF_FILE 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 _neutron_service_plugin_class_add taas
} }