openstack/neutron
Code Issues Proposed changes

Refactoring devstack script

Browse Source 
Change-Id: Iabb7313b667ef6921acbb65b1eb583603b4d0b11
This commit is contained in:
Hirofumi Ichihara 2015-09-10 16:54:31 +09:00
parent 866bafa631
commit d04284b0a1
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
devstack/plugin.sh
View File

@ -5,36 +5,35 @@ source $LIBDIR/l2_agent_sriovnicswitch
source $LIBDIR/ml2 source $LIBDIR/ml2
source $LIBDIR/qos source $LIBDIR/qos
if [[ "$1" == "stack" ]]; then
if [[ "$1" == "stack" && "$2" == "install" ]]; then case "$2" in
if is_service_enabled q-qos; then install)
configure_qos if is_service_enabled q-qos; then
fi configure_qos
fi fi
;;
if [[ "$1" == "stack" && "$2" == "post-config" ]]; then post-config)
if is_service_enabled q-agt; then if is_service_enabled q-agt; then
configure_l2_agent configure_l2_agent
fi fi
#Note: sriov agent should run with OVS or linux bridge agent #Note: sriov agent should run with OVS or linux bridge agent
#because they are the mechanisms that bind the DHCP and router ports. #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. #Currently devstack lacks the option to run two agents on the same node.
#Therefore we create new service, q-sriov-agt, and the q-agt should be OVS #Therefore we create new service, q-sriov-agt, and the q-agt should be OVS
#or linux bridge. #or linux bridge.
if is_service_enabled q-sriov-agt; then if is_service_enabled q-sriov-agt; then
configure_$Q_PLUGIN configure_$Q_PLUGIN
configure_l2_agent configure_l2_agent
configure_l2_agent_sriovnicswitch configure_l2_agent_sriovnicswitch
fi fi
fi ;;
extra)
if [[ "$1" == "stack" && "$2" == "extra" ]]; then if is_service_enabled q-sriov-agt; then
if is_service_enabled q-sriov-agt; then start_l2_agent_sriov
start_l2_agent_sriov fi
fi ;;
fi esac
elif [[ "$1" == "unstack" ]]; then
if [[ "$1" == "unstack" ]]; then
if is_service_enabled q-sriov-agt; then if is_service_enabled q-sriov-agt; then
stop_l2_agent_sriov stop_l2_agent_sriov
fi fi