From 91d8cde82885cad020c0ac11e825f590b51e42eb Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@midokura.com>
Date: Wed, 22 Feb 2017 11:48:58 -0500
Subject: [PATCH] devstack: Adapt to lib/neutron

Depends-On: I9068fd608e82e70db8d725f92269a26920efebcb
Change-Id: I1bf8f68d7505a4f60938d04a32394b8bbe89736e
---
 devstack/plugin.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index fa41404..4d1ef83 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -23,12 +23,9 @@ function install_taas {
 }
 
 function configure_taas_plugin {
-    if [ ! -d $NEUTRON_CONF_DIR ]; then
-        _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
+    neutron_service_plugin_class_add taas
 }
 
 function configure_taas_openvswitch_agent {
@@ -51,8 +48,8 @@ if is_service_enabled taas; then
             :
         elif [[ "$2" == "install" ]]; then
             install_taas
-            configure_taas_plugin
         elif [[ "$2" == "post-config" ]]; then
+            configure_taas_plugin
             neutron-db-manage --subproject tap-as-a-service upgrade head
             echo "Configuring taas"
             if [ "$TAAS_SERVICE_DRIVER" ]; then