From 1ee06af4712eafa7199f7201c16fa01bfb50ec8e Mon Sep 17 00:00:00 2001 From: Abhishek Raut Date: Sun, 10 Jul 2016 02:39:46 -0700 Subject: [PATCH] devstack: Stop using Q_PLUGIN_EXTRA_CONF_FILES Related-Bug: #1599936 Change-Id: I2ee08c9018bfd007013eb7d62c5264272faf379b --- devstack/README.rst | 2 -- devstack/devstackgaterc | 4 ---- devstack/plugin.sh | 1 + 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/devstack/README.rst b/devstack/README.rst index d4f2d5d..6b486eb 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -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 diff --git a/devstack/devstackgaterc b/devstack/devstackgaterc index 6589f23..599b4fd 100644 --- a/devstack/devstackgaterc +++ b/devstack/devstackgaterc @@ -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="^(?!.*" diff --git a/devstack/plugin.sh b/devstack/plugin.sh index deb2c07..fa41404 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -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 }