devstack: Adapt to lib/neutron
Change-Id: Idcb903002aec823aa1e546e8e90815ebac614e5b
This commit is contained in:
parent
3863c03bc8
commit
895756d9b9
|
@ -17,3 +17,16 @@ function configure_ml2 {
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function configure_ml2_extension_drivers {
|
||||||
|
if is_neutron_legacy_enabled; then
|
||||||
|
# NOTE(yamamoto): This overwrites what neutron-legacy set,
|
||||||
|
# with the latest set of drivers.
|
||||||
|
# While we modifies Q_ML2_PLUGIN_EXT_DRIVERS (via
|
||||||
|
# neutron_ml2_extension_driver_add calls) in the post-config phase,
|
||||||
|
# lib/neutron-legcay populates this in "configure_neutron", which is
|
||||||
|
# before post-config.
|
||||||
|
# REVISIT(yamamoto): Probably this ought to be in lib/neutron-legcay
|
||||||
|
iniset /$NEUTRON_CORE_PLUGIN_CONF ml2 extension_drivers ${Q_ML2_PLUGIN_EXT_DRIVERS}
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
|
@ -19,6 +19,14 @@ fi
|
||||||
if [[ "$1" == "stack" ]]; then
|
if [[ "$1" == "stack" ]]; then
|
||||||
case "$2" in
|
case "$2" in
|
||||||
install)
|
install)
|
||||||
|
if [[ "$NEUTRON_AGENT" == "openvswitch" ]] && \
|
||||||
|
[[ "$Q_BUILD_OVS_FROM_GIT" == "True" ]]; then
|
||||||
|
remove_ovs_packages
|
||||||
|
compile_ovs True /usr /var
|
||||||
|
start_new_ovs
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
post-config)
|
||||||
if is_service_enabled q-flavors neutron-flavors; then
|
if is_service_enabled q-flavors neutron-flavors; then
|
||||||
configure_flavors
|
configure_flavors
|
||||||
fi
|
fi
|
||||||
|
@ -30,21 +38,11 @@ if [[ "$1" == "stack" ]]; then
|
||||||
fi
|
fi
|
||||||
if is_service_enabled q-dns neutron-dns; then
|
if is_service_enabled q-dns neutron-dns; then
|
||||||
configure_dns_extension
|
configure_dns_extension
|
||||||
|
post_config_dns_extension
|
||||||
fi
|
fi
|
||||||
if is_service_enabled neutron-segments; then
|
if is_service_enabled neutron-segments; then
|
||||||
configure_segments_extension
|
configure_segments_extension
|
||||||
fi
|
fi
|
||||||
if [[ "$NEUTRON_AGENT" == "openvswitch" ]] && \
|
|
||||||
[[ "$Q_BUILD_OVS_FROM_GIT" == "True" ]]; then
|
|
||||||
remove_ovs_packages
|
|
||||||
compile_ovs True /usr /var
|
|
||||||
start_new_ovs
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
post-config)
|
|
||||||
if is_service_enabled q-dns neutron-dns; then
|
|
||||||
post_config_dns_extension
|
|
||||||
fi
|
|
||||||
if is_service_enabled q-agt neutron-agent; then
|
if is_service_enabled q-agt neutron-agent; then
|
||||||
configure_l2_agent
|
configure_l2_agent
|
||||||
fi
|
fi
|
||||||
|
@ -58,6 +56,9 @@ if [[ "$1" == "stack" ]]; then
|
||||||
configure_l2_agent
|
configure_l2_agent
|
||||||
configure_l2_agent_sriovnicswitch
|
configure_l2_agent_sriovnicswitch
|
||||||
fi
|
fi
|
||||||
|
if [ $NEUTRON_CORE_PLUGIN = ml2 ]; then
|
||||||
|
configure_ml2_extension_drivers
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
extra)
|
extra)
|
||||||
if is_service_enabled q-sriov-agt neutron-sriov-agent; then
|
if is_service_enabled q-sriov-agt neutron-sriov-agent; then
|
||||||
|
|
Loading…
Reference in New Issue