Skip to content

Commit

Permalink
Remove BGP code from neutron
Browse files Browse the repository at this point in the history
Once the spinout is undergoing we should perform the eviction.

Partially-implements: blueprint bgp-spinout

Depends-on: I8be510153edbc496575cde34943ca4c56645e0fb
Change-Id: I20b6ddd37d10eae70e8294d578e53137c0f866fe
  • Loading branch information
armando-migliaccio committed Apr 26, 2016
1 parent 78fff41 commit e8d3626
Show file tree
Hide file tree
Showing 58 changed files with 12 additions and 7,328 deletions.
29 changes: 0 additions & 29 deletions devstack/lib/bgp

This file was deleted.

13 changes: 0 additions & 13 deletions devstack/plugin.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
LIBDIR=$DEST/neutron/devstack/lib

source $LIBDIR/bgp
source $LIBDIR/flavors
source $LIBDIR/l2_agent
source $LIBDIR/l2_agent_sriovnicswitch
Expand All @@ -19,9 +18,6 @@ if [[ "$1" == "stack" ]]; then
if is_service_enabled q-qos; then
configure_qos
fi
if is_service_enabled q-bgp; then
configure_bgp
fi
if [[ "$Q_AGENT" == "openvswitch" ]] && \
[[ "$Q_BUILD_OVS_FROM_GIT" == "True" ]]; then
remove_ovs_packages
Expand All @@ -33,9 +29,6 @@ if [[ "$1" == "stack" ]]; then
if is_service_enabled q-agt; then
configure_l2_agent
fi
if is_service_enabled q-bgp && is_service_enabled q-bgp-agt; then
configure_bgp_dragent
fi
#Note: sriov agent should run with OVS or linux bridge agent
#because they are the mechanisms that bind the DHCP and router ports.
#Currently devstack lacks the option to run two agents on the same node.
Expand All @@ -51,16 +44,10 @@ if [[ "$1" == "stack" ]]; then
if is_service_enabled q-sriov-agt; then
start_l2_agent_sriov
fi
if is_service_enabled q-bgp && is_service_enabled q-bgp-agt; then
start_bgp_dragent
fi
;;
esac
elif [[ "$1" == "unstack" ]]; then
if is_service_enabled q-sriov-agt; then
stop_l2_agent_sriov
fi
if is_service_enabled q-bgp && is_service_enabled q-bgp-agt; then
stop_bgp_dragent
fi
fi
7 changes: 0 additions & 7 deletions devstack/settings
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
L2_AGENT_EXTENSIONS=${L2_AGENT_EXTENSIONS:-}

#BGP binary and config information
AGENT_BGP_BINARY=${AGENT_BGP_BINARY:-"$NEUTRON_BIN_DIR/neutron-bgp-dragent"}
Q_BGP_DRAGENT_CONF_FILE=${Q_BGP_DRAGENT_CONF_FILE:-"$NEUTRON_CONF_DIR/bgp_dragent.ini"}
BGP_ROUTER_ID=${BGP_ROUTER_ID:-}

RYU_BGP_SPEAKER_DRIVER="neutron.services.bgp.driver.ryu.driver.RyuBgpDriver"
7 changes: 0 additions & 7 deletions etc/oslo-config-generator/bgp_dragent.ini

This file was deleted.

20 changes: 1 addition & 19 deletions etc/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -213,26 +213,8 @@
"get_flavor_service_profile": "rule:regular_user",
"get_auto_allocated_topology": "rule:admin_or_owner",

"get_bgp_speaker": "rule:admin_only",
"create_bgp_speaker": "rule:admin_only",
"update_bgp_speaker": "rule:admin_only",
"delete_bgp_speaker": "rule:admin_only",

"get_bgp_peer": "rule:admin_only",
"create_bgp_peer": "rule:admin_only",
"update_bgp_peer": "rule:admin_only",
"delete_bgp_peer": "rule:admin_only",

"add_bgp_peer": "rule:admin_only",
"remove_bgp_peer": "rule:admin_only",

"add_gateway_network": "rule:admin_only",
"remove_gateway_network": "rule:admin_only",

"get_advertised_routes":"rule:admin_only",

"add_bgp_speaker_to_dragent": "rule:admin_only",
"remove_bgp_speaker_from_dragent": "rule:admin_only",
"list_bgp_speaker_on_dragent": "rule:admin_only",
"list_dragent_hosting_bgp_speaker": "rule:admin_only"
"get_advertised_routes":"rule:admin_only"
}
105 changes: 0 additions & 105 deletions neutron/api/rpc/agentnotifiers/bgp_dr_rpc_agent_api.py

This file was deleted.

65 changes: 0 additions & 65 deletions neutron/api/rpc/handlers/bgp_speaker_rpc.py

This file was deleted.

20 changes: 0 additions & 20 deletions neutron/cmd/eventlet/agents/bgp_dragent.py

This file was deleted.

Loading

0 comments on commit e8d3626

Please sign in to comment.