diff --git a/devstack/lib/segments b/devstack/lib/segments new file mode 100644 index 00000000000..5ef3172b950 --- /dev/null +++ b/devstack/lib/segments @@ -0,0 +1,7 @@ +function configure_segments_service_plugin { + neutron_service_plugin_class_add segments +} + +function configure_segments_extension { + configure_segments_service_plugin +} diff --git a/devstack/plugin.sh b/devstack/plugin.sh index cfa8097bdf7..0d4ce8d01b6 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -7,6 +7,7 @@ source $LIBDIR/l2_agent_sriovnicswitch source $LIBDIR/ml2 source $LIBDIR/qos source $LIBDIR/ovs +source $LIBDIR/segments source $LIBDIR/trunk Q_BUILD_OVS_FROM_GIT=$(trueorfalse False Q_BUILD_OVS_FROM_GIT) @@ -30,6 +31,9 @@ if [[ "$1" == "stack" ]]; then if is_service_enabled q-dns neutron-dns; then configure_dns_extension fi + if is_service_enabled neutron-segments; then + configure_segments_extension + fi if [[ "$NEUTRON_AGENT" == "openvswitch" ]] && \ [[ "$Q_BUILD_OVS_FROM_GIT" == "True" ]]; then remove_ovs_packages diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh index 885cd954217..58cc8b0d849 100644 --- a/neutron/tests/contrib/gate_hook.sh +++ b/neutron/tests/contrib/gate_hook.sh @@ -98,6 +98,7 @@ case $VENV in load_conf_hook quotas load_rc_hook dns load_rc_hook qos + load_rc_hook segments load_rc_hook trunk load_conf_hook vlan_provider load_conf_hook type_drivers diff --git a/neutron/tests/contrib/hooks/api_all_extensions b/neutron/tests/contrib/hooks/api_all_extensions index b891fdcee05..da8dbfd2c0f 100644 --- a/neutron/tests/contrib/hooks/api_all_extensions +++ b/neutron/tests/contrib/hooks/api_all_extensions @@ -33,6 +33,7 @@ NETWORK_API_EXTENSIONS+=",rbac-policies" NETWORK_API_EXTENSIONS+=",router" NETWORK_API_EXTENSIONS+=",router_availability_zone" NETWORK_API_EXTENSIONS+=",security-group" +NETWORK_API_EXTENSIONS+=",segment" NETWORK_API_EXTENSIONS+=",service-type" NETWORK_API_EXTENSIONS+=",sorting" NETWORK_API_EXTENSIONS+=",standard-attr-description" diff --git a/neutron/tests/contrib/hooks/segments b/neutron/tests/contrib/hooks/segments new file mode 100644 index 00000000000..81e5f110531 --- /dev/null +++ b/neutron/tests/contrib/hooks/segments @@ -0,0 +1 @@ +enable_service neutron-segments