Merge "remove neutron 3rd party infrastructure"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
9391a56ffe
@ -1002,55 +1002,6 @@ function _ssh_check_neutron {
|
||||
test_with_retry "$testcmd" "server $ip didn't become ssh-able" $timeout_sec
|
||||
}
|
||||
|
||||
# Neutron 3rd party programs
|
||||
#---------------------------
|
||||
|
||||
# please refer to ``lib/neutron_thirdparty/README.md`` for details
|
||||
NEUTRON_THIRD_PARTIES=""
|
||||
for f in $TOP_DIR/lib/neutron_thirdparty/*; do
|
||||
third_party=$(basename $f)
|
||||
if is_service_enabled $third_party; then
|
||||
source $TOP_DIR/lib/neutron_thirdparty/$third_party
|
||||
NEUTRON_THIRD_PARTIES="$NEUTRON_THIRD_PARTIES,$third_party"
|
||||
fi
|
||||
done
|
||||
|
||||
function _neutron_third_party_do {
|
||||
for third_party in ${NEUTRON_THIRD_PARTIES//,/ }; do
|
||||
${1}_${third_party}
|
||||
done
|
||||
}
|
||||
|
||||
# configure_neutron_third_party() - Set config files, create data dirs, etc
|
||||
function configure_neutron_third_party {
|
||||
_neutron_third_party_do configure
|
||||
}
|
||||
|
||||
# init_neutron_third_party() - Initialize databases, etc.
|
||||
function init_neutron_third_party {
|
||||
_neutron_third_party_do init
|
||||
}
|
||||
|
||||
# install_neutron_third_party() - Collect source and prepare
|
||||
function install_neutron_third_party {
|
||||
_neutron_third_party_do install
|
||||
}
|
||||
|
||||
# start_neutron_third_party() - Start running processes, including screen
|
||||
function start_neutron_third_party {
|
||||
_neutron_third_party_do start
|
||||
}
|
||||
|
||||
# stop_neutron_third_party - Stop running processes (non-screen)
|
||||
function stop_neutron_third_party {
|
||||
_neutron_third_party_do stop
|
||||
}
|
||||
|
||||
# check_neutron_third_party_integration() - Check that third party integration is sane
|
||||
function check_neutron_third_party_integration {
|
||||
_neutron_third_party_do check
|
||||
}
|
||||
|
||||
# Restore xtrace
|
||||
$_XTRACE_NEUTRON
|
||||
|
||||
|
||||
41
lib/neutron_thirdparty/README.md
vendored
41
lib/neutron_thirdparty/README.md
vendored
@ -1,41 +0,0 @@
|
||||
Neutron third party specific files
|
||||
==================================
|
||||
Some Neutron plugins require third party programs to function.
|
||||
The files under the directory, ``lib/neutron_thirdparty/``, will be used
|
||||
when their service are enabled.
|
||||
Third party program specific configuration variables should be in this file.
|
||||
|
||||
* filename: ``<third_party>``
|
||||
* The corresponding file name should be same to service name, ``<third_party>``.
|
||||
|
||||
functions
|
||||
---------
|
||||
``lib/neutron-legacy`` calls the following functions when the ``<third_party>`` is enabled
|
||||
|
||||
functions to be implemented
|
||||
* ``configure_<third_party>``:
|
||||
set config files, create data dirs, etc
|
||||
e.g.
|
||||
sudo python setup.py deploy
|
||||
iniset $XXXX_CONF...
|
||||
|
||||
* ``init_<third_party>``:
|
||||
initialize databases, etc
|
||||
|
||||
* ``install_<third_party>``:
|
||||
collect source and prepare
|
||||
e.g.
|
||||
git clone xxx
|
||||
|
||||
* ``start_<third_party>``:
|
||||
start running processes, including screen if USE_SCREEN=True
|
||||
e.g.
|
||||
run_process XXXX "$XXXX_DIR/bin/XXXX-bin"
|
||||
|
||||
* ``stop_<third_party>``:
|
||||
stop running processes (non-screen)
|
||||
e.g.
|
||||
stop_process XXXX
|
||||
|
||||
* ``check_<third_party>``:
|
||||
verify that the integration between neutron server and third-party components is sane
|
||||
54
lib/neutron_thirdparty/bigswitch_floodlight
vendored
54
lib/neutron_thirdparty/bigswitch_floodlight
vendored
@ -1,54 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Big Switch/FloodLight OpenFlow Controller
|
||||
# ------------------------------------------
|
||||
|
||||
# Save trace setting
|
||||
_XTRACE_NEUTRON_BIGSWITCH=$(set +o | grep xtrace)
|
||||
set +o xtrace
|
||||
|
||||
BS_FL_CONTROLLERS_PORT=${BS_FL_CONTROLLERS_PORT:-localhost:80}
|
||||
BS_FL_OF_PORT=${BS_FL_OF_PORT:-6633}
|
||||
|
||||
function configure_bigswitch_floodlight {
|
||||
:
|
||||
}
|
||||
|
||||
function init_bigswitch_floodlight {
|
||||
install_neutron_agent_packages
|
||||
|
||||
echo -n "Installing OVS managed by the openflow controllers:"
|
||||
echo ${BS_FL_CONTROLLERS_PORT}
|
||||
|
||||
# Create local OVS bridge and configure it
|
||||
sudo ovs-vsctl --no-wait -- --if-exists del-br ${OVS_BRIDGE}
|
||||
sudo ovs-vsctl --no-wait add-br ${OVS_BRIDGE}
|
||||
sudo ovs-vsctl --no-wait br-set-external-id ${OVS_BRIDGE} bridge-id ${OVS_BRIDGE}
|
||||
|
||||
ctrls=
|
||||
for ctrl in `echo ${BS_FL_CONTROLLERS_PORT} | tr ',' ' '`; do
|
||||
ctrl=${ctrl%:*}
|
||||
ctrls="${ctrls} tcp:${ctrl}:${BS_FL_OF_PORT}"
|
||||
done
|
||||
echo "Adding Network conttrollers: " ${ctrls}
|
||||
sudo ovs-vsctl --no-wait set-controller ${OVS_BRIDGE} ${ctrls}
|
||||
}
|
||||
|
||||
function install_bigswitch_floodlight {
|
||||
:
|
||||
}
|
||||
|
||||
function start_bigswitch_floodlight {
|
||||
:
|
||||
}
|
||||
|
||||
function stop_bigswitch_floodlight {
|
||||
:
|
||||
}
|
||||
|
||||
function check_bigswitch_floodlight {
|
||||
:
|
||||
}
|
||||
|
||||
# Restore xtrace
|
||||
$_XTRACE_NEUTRON_BIGSWITCH
|
||||
4
lib/neutron_thirdparty/vmware_nsx
vendored
4
lib/neutron_thirdparty/vmware_nsx
vendored
@ -1,4 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# REVISIT(roeyc): this file left empty so that 'enable_service vmware_nsx'
|
||||
# continues to work.
|
||||
12
stack.sh
12
stack.sh
@ -843,7 +843,6 @@ fi
|
||||
if is_service_enabled neutron; then
|
||||
# Network service
|
||||
stack_install_service neutron
|
||||
install_neutron_third_party
|
||||
fi
|
||||
|
||||
if is_service_enabled nova; then
|
||||
@ -1093,15 +1092,6 @@ if is_service_enabled neutron; then
|
||||
fi
|
||||
fi
|
||||
|
||||
# Some Neutron plugins require network controllers which are not
|
||||
# a part of the OpenStack project. Configure and start them.
|
||||
if is_service_enabled neutron; then
|
||||
configure_neutron_third_party
|
||||
init_neutron_third_party
|
||||
start_neutron_third_party
|
||||
fi
|
||||
|
||||
|
||||
# Nova
|
||||
# ----
|
||||
|
||||
@ -1235,11 +1225,9 @@ fi
|
||||
if is_service_enabled neutron-api; then
|
||||
echo_summary "Starting Neutron"
|
||||
start_neutron_api
|
||||
# check_neutron_third_party_integration
|
||||
elif is_service_enabled q-svc; then
|
||||
echo_summary "Starting Neutron"
|
||||
start_neutron_service_and_check
|
||||
check_neutron_third_party_integration
|
||||
elif is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-net; then
|
||||
NM_CONF=${NOVA_CONF}
|
||||
if is_service_enabled n-cell; then
|
||||
|
||||
@ -168,7 +168,6 @@ fi
|
||||
|
||||
if is_service_enabled neutron; then
|
||||
stop_neutron
|
||||
stop_neutron_third_party
|
||||
cleanup_neutron
|
||||
fi
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user