b762ecf9e5
Instead of using tox-install.sh, we can install horizon and neutron now directly from pypi - or use the current branch in CI system using tox-siblings. Update tox.ini for this change and add neutron to requirements file. This commit includes the following unrelated changes to pass the gate. ---------------------------------------- devstack: Use setup_develop to install As this project is in the global requirements now, we need to edit the constraints. Change-Id: I44e05b4e7b6f1c15314799c4a1e8c22f79abb74a ---------------------------------------- Update after rpc create_connection removal Recently neutron.common.rpc.create_connection has been removed. [1] [1] I2f4b24ba732be47fc9911be1e24406fb1ffe821e Closes-Bug: #1770851 Change-Id: Ie83299b7a280dab0d5dc9dc3304b5d6091b4a0cc ---------------------------------------- Co-Authored-By: YAMAMOTO Takashi <yamamoto@midokura.com> Change-Id: Ifffca6361b1c3991481442053bf182bde3c2d44a
72 lines
2.3 KiB
Bash
72 lines
2.3 KiB
Bash
#!/bin/bash
|
|
|
|
# Copyright 2015 Midokura SARL
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
# This script is meant to be sourced from devstack. It is a wrapper of
|
|
# devmido scripts that allows proper exporting of environment variables.
|
|
|
|
|
|
function install_taas {
|
|
setup_develop $TAAS_PLUGIN_PATH
|
|
}
|
|
|
|
function configure_taas_plugin {
|
|
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
|
|
}
|
|
|
|
if is_service_enabled taas; then
|
|
if [[ "$1" == "stack" ]]; then
|
|
if [[ "$2" == "pre-install" ]]; then
|
|
:
|
|
elif [[ "$2" == "install" ]]; then
|
|
install_taas
|
|
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
|
|
inicomment $TAAS_PLUGIN_CONF_FILE service_providers service_provider
|
|
iniadd $TAAS_PLUGIN_CONF_FILE service_providers service_provider $TAAS_SERVICE_DRIVER
|
|
fi
|
|
elif [[ "$2" == "extra" ]]; then
|
|
:
|
|
fi
|
|
elif [[ "$1" == "unstack" ]]; then
|
|
:
|
|
fi
|
|
fi
|
|
|
|
if is_service_enabled q-agt neutron-agent; then
|
|
if [[ "$1" == "stack" ]]; then
|
|
if [[ "$2" == "pre-install" ]]; then
|
|
:
|
|
elif [[ "$2" == "install" ]]; then
|
|
install_taas
|
|
elif [[ "$2" == "post-config" ]]; then
|
|
if is_service_enabled q-agt neutron-agent; then
|
|
source $NEUTRON_DIR/devstack/lib/l2_agent
|
|
plugin_agent_add_l2_agent_extension taas
|
|
configure_l2_agent
|
|
fi
|
|
elif [[ "$2" == "extra" ]]; then
|
|
:
|
|
fi
|
|
elif [[ "$1" == "unstack" ]]; then
|
|
:
|
|
fi
|
|
fi
|