Browse Source

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
changes/44/461844/2
Mitchell Jameson 5 years ago
parent
commit
195520e222
  1. 1
      devstack/plugin.sh
  2. 8
      devstack/settings

1
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

8
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)

Loading…
Cancel
Save