From 195520e222b7417cb57a3ad9b7337df932ff0ab4 Mon Sep 17 00:00:00 2001
From: Mitchell Jameson <mitchell@arista.com>
Date: Mon, 1 May 2017 16:05:04 -0700
Subject: [PATCH] Fix ml2_conf_arista.ini installation

Use the setting if provided in local.conf and switch to
using neutron_server_config_add as Q_EXTRA_PLUGIN_CONF*
is deprecated.

Change-Id: I955075e5a4f208a6b136b35f9e462249e2dcdca2
---
 devstack/plugin.sh | 1 +
 devstack/settings  | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 52ff1a5..91265fe 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -66,6 +66,7 @@ function configure_arista() {
     if [ -n "${ARISTA_TYPE_DRIVER_SYNC_INTERVAL+x}" ]; then
         iniset $ARISTA_ML2_CONF_FILE arista_type_driver sync_interval $ARISTA_TYPE_DRIVER_SYNC_INTERVAL
     fi
+    neutron_server_config_add $ARISTA_ML2_CONF_FILE
 }
 
 if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then
diff --git a/devstack/settings b/devstack/settings
index 0e436d6..c2dfccf 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -3,13 +3,9 @@ if ! [[ "$Q_ML2_PLUGIN_MECHANISM_DRIVERS" =~ "arista" ]]; then
 fi
 
 ARISTA_DIR=${ARISTA_DIR:-$DEST/networking-arista}
-ARISTA_ML2_FILENAME=${ARISTA_ML2_CONF_FILENAME:-"ml2_conf_arista.ini"}
 
-ARISTA_ML2_CONF_SAMPLE=$ARISTA_DIR/etc/$ARISTA_ML2_FILENAME
-ARISTA_ML2_CONF_FILE=$NEUTRON_CONF_DIR/$ARISTA_ML2_FILENAME
+ARISTA_ML2_CONF_SAMPLE=$ARISTA_DIR/etc/ml2_conf_arista.ini
+ARISTA_ML2_CONF_FILE=${ARISTA_ML2_CONF_FILE:-"$NEUTRON_CONF_DIR/ml2_conf_arista.ini"}
 ARISTA_API_TYPE=${ARISTA_API_TYPE:-"EAPI"}
 ARISTA_REGION_NAME=${ARISTA_REGION_NAME:-"$REGION_NAME"}
 
-Q_PLUGIN_EXTRA_CONF_PATH=$NEUTRON_CONF_DIR
-Q_PLUGIN_EXTRA_CONF_FILES=($ARISTA_ML2_FILENAME)
-