This was used solely by bigswitch, and everyone else has moved over to
devstack plugins. Cleaning this out makes the core logic much simpler.
Depends-On: I8fd2ec6e651f858d0ce109fc335189796c3264b8
(grenade removal)
Change-Id: I47769fc7faae22d263ffd923165abd48f0791a2c
... | ... |
@@ -1003,55 +1003,6 @@ function _ssh_check_neutron { |
1003 | 1003 |
test_with_retry "$testcmd" "server $ip didn't become ssh-able" $timeout_sec |
1004 | 1004 |
} |
1005 | 1005 |
|
1006 |
-# Neutron 3rd party programs |
|
1007 |
-#--------------------------- |
|
1008 |
- |
|
1009 |
-# please refer to ``lib/neutron_thirdparty/README.md`` for details |
|
1010 |
-NEUTRON_THIRD_PARTIES="" |
|
1011 |
-for f in $TOP_DIR/lib/neutron_thirdparty/*; do |
|
1012 |
- third_party=$(basename $f) |
|
1013 |
- if is_service_enabled $third_party; then |
|
1014 |
- source $TOP_DIR/lib/neutron_thirdparty/$third_party |
|
1015 |
- NEUTRON_THIRD_PARTIES="$NEUTRON_THIRD_PARTIES,$third_party" |
|
1016 |
- fi |
|
1017 |
-done |
|
1018 |
- |
|
1019 |
-function _neutron_third_party_do { |
|
1020 |
- for third_party in ${NEUTRON_THIRD_PARTIES//,/ }; do |
|
1021 |
- ${1}_${third_party} |
|
1022 |
- done |
|
1023 |
-} |
|
1024 |
- |
|
1025 |
-# configure_neutron_third_party() - Set config files, create data dirs, etc |
|
1026 |
-function configure_neutron_third_party { |
|
1027 |
- _neutron_third_party_do configure |
|
1028 |
-} |
|
1029 |
- |
|
1030 |
-# init_neutron_third_party() - Initialize databases, etc. |
|
1031 |
-function init_neutron_third_party { |
|
1032 |
- _neutron_third_party_do init |
|
1033 |
-} |
|
1034 |
- |
|
1035 |
-# install_neutron_third_party() - Collect source and prepare |
|
1036 |
-function install_neutron_third_party { |
|
1037 |
- _neutron_third_party_do install |
|
1038 |
-} |
|
1039 |
- |
|
1040 |
-# start_neutron_third_party() - Start running processes, including screen |
|
1041 |
-function start_neutron_third_party { |
|
1042 |
- _neutron_third_party_do start |
|
1043 |
-} |
|
1044 |
- |
|
1045 |
-# stop_neutron_third_party - Stop running processes (non-screen) |
|
1046 |
-function stop_neutron_third_party { |
|
1047 |
- _neutron_third_party_do stop |
|
1048 |
-} |
|
1049 |
- |
|
1050 |
-# check_neutron_third_party_integration() - Check that third party integration is sane |
|
1051 |
-function check_neutron_third_party_integration { |
|
1052 |
- _neutron_third_party_do check |
|
1053 |
-} |
|
1054 |
- |
|
1055 | 1006 |
# Restore xtrace |
1056 | 1007 |
$_XTRACE_NEUTRON |
1057 | 1008 |
|
1058 | 1009 |
deleted file mode 100644 |
... | ... |
@@ -1,41 +0,0 @@ |
1 |
-Neutron third party specific files |
|
2 |
-================================== |
|
3 |
-Some Neutron plugins require third party programs to function. |
|
4 |
-The files under the directory, ``lib/neutron_thirdparty/``, will be used |
|
5 |
-when their service are enabled. |
|
6 |
-Third party program specific configuration variables should be in this file. |
|
7 |
- |
|
8 |
-* filename: ``<third_party>`` |
|
9 |
- * The corresponding file name should be same to service name, ``<third_party>``. |
|
10 |
- |
|
11 |
-functions |
|
12 |
-``lib/neutron-legacy`` calls the following functions when the ``<third_party>`` is enabled |
|
13 |
- |
|
14 |
-functions to be implemented |
|
15 |
-* ``configure_<third_party>``: |
|
16 |
- set config files, create data dirs, etc |
|
17 |
- e.g. |
|
18 |
- sudo python setup.py deploy |
|
19 |
- iniset $XXXX_CONF... |
|
20 |
- |
|
21 |
-* ``init_<third_party>``: |
|
22 |
- initialize databases, etc |
|
23 |
- |
|
24 |
-* ``install_<third_party>``: |
|
25 |
- collect source and prepare |
|
26 |
- e.g. |
|
27 |
- git clone xxx |
|
28 |
- |
|
29 |
-* ``start_<third_party>``: |
|
30 |
- start running processes, including screen if USE_SCREEN=True |
|
31 |
- e.g. |
|
32 |
- run_process XXXX "$XXXX_DIR/bin/XXXX-bin" |
|
33 |
- |
|
34 |
-* ``stop_<third_party>``: |
|
35 |
- stop running processes (non-screen) |
|
36 |
- e.g. |
|
37 |
- stop_process XXXX |
|
38 |
- |
|
39 |
-* ``check_<third_party>``: |
|
40 |
- verify that the integration between neutron server and third-party components is sane |
41 | 1 |
deleted file mode 100644 |
... | ... |
@@ -1,54 +0,0 @@ |
1 |
-#!/bin/bash |
|
2 |
-# |
|
3 |
-# Big Switch/FloodLight OpenFlow Controller |
|
4 |
-# ------------------------------------------ |
|
5 |
- |
|
6 |
-# Save trace setting |
|
7 |
-_XTRACE_NEUTRON_BIGSWITCH=$(set +o | grep xtrace) |
|
8 |
-set +o xtrace |
|
9 |
- |
|
10 |
-BS_FL_CONTROLLERS_PORT=${BS_FL_CONTROLLERS_PORT:-localhost:80} |
|
11 |
-BS_FL_OF_PORT=${BS_FL_OF_PORT:-6633} |
|
12 |
- |
|
13 |
-function configure_bigswitch_floodlight { |
|
14 |
- : |
|
15 |
-} |
|
16 |
- |
|
17 |
-function init_bigswitch_floodlight { |
|
18 |
- install_neutron_agent_packages |
|
19 |
- |
|
20 |
- echo -n "Installing OVS managed by the openflow controllers:" |
|
21 |
- echo ${BS_FL_CONTROLLERS_PORT} |
|
22 |
- |
|
23 |
- # Create local OVS bridge and configure it |
|
24 |
- sudo ovs-vsctl --no-wait -- --if-exists del-br ${OVS_BRIDGE} |
|
25 |
- sudo ovs-vsctl --no-wait add-br ${OVS_BRIDGE} |
|
26 |
- sudo ovs-vsctl --no-wait br-set-external-id ${OVS_BRIDGE} bridge-id ${OVS_BRIDGE} |
|
27 |
- |
|
28 |
- ctrls= |
|
29 |
- for ctrl in `echo ${BS_FL_CONTROLLERS_PORT} | tr ',' ' '`; do |
|
30 |
- ctrl=${ctrl%:*} |
|
31 |
- ctrls="${ctrls} tcp:${ctrl}:${BS_FL_OF_PORT}" |
|
32 |
- done |
|
33 |
- echo "Adding Network conttrollers: " ${ctrls} |
|
34 |
- sudo ovs-vsctl --no-wait set-controller ${OVS_BRIDGE} ${ctrls} |
|
35 |
-} |
|
36 |
- |
|
37 |
-function install_bigswitch_floodlight { |
|
38 |
- : |
|
39 |
-} |
|
40 |
- |
|
41 |
-function start_bigswitch_floodlight { |
|
42 |
- : |
|
43 |
-} |
|
44 |
- |
|
45 |
-function stop_bigswitch_floodlight { |
|
46 |
- : |
|
47 |
-} |
|
48 |
- |
|
49 |
-function check_bigswitch_floodlight { |
|
50 |
- : |
|
51 |
-} |
|
52 |
- |
|
53 |
-# Restore xtrace |
|
54 |
-$_XTRACE_NEUTRON_BIGSWITCH |
... | ... |
@@ -843,7 +843,6 @@ fi |
843 | 843 |
if is_service_enabled neutron; then |
844 | 844 |
# Network service |
845 | 845 |
stack_install_service neutron |
846 |
- install_neutron_third_party |
|
847 | 846 |
fi |
848 | 847 |
|
849 | 848 |
if is_service_enabled nova; then |
... | ... |
@@ -1093,15 +1092,6 @@ if is_service_enabled neutron; then |
1093 | 1093 |
fi |
1094 | 1094 |
fi |
1095 | 1095 |
|
1096 |
-# Some Neutron plugins require network controllers which are not |
|
1097 |
-# a part of the OpenStack project. Configure and start them. |
|
1098 |
-if is_service_enabled neutron; then |
|
1099 |
- configure_neutron_third_party |
|
1100 |
- init_neutron_third_party |
|
1101 |
- start_neutron_third_party |
|
1102 |
-fi |
|
1103 |
- |
|
1104 |
- |
|
1105 | 1096 |
# Nova |
1106 | 1097 |
# ---- |
1107 | 1098 |
|
... | ... |
@@ -1235,11 +1225,9 @@ fi |
1235 | 1235 |
if is_service_enabled neutron-api; then |
1236 | 1236 |
echo_summary "Starting Neutron" |
1237 | 1237 |
start_neutron_api |
1238 |
- # check_neutron_third_party_integration |
|
1239 | 1238 |
elif is_service_enabled q-svc; then |
1240 | 1239 |
echo_summary "Starting Neutron" |
1241 | 1240 |
start_neutron_service_and_check |
1242 |
- check_neutron_third_party_integration |
|
1243 | 1241 |
elif is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-net; then |
1244 | 1242 |
NM_CONF=${NOVA_CONF} |
1245 | 1243 |
if is_service_enabled n-cell; then |