Skip to content

Commit 2a24251

Browse files
sc68calHirofumi IchiharaDean Troyer
committed
Begin new lib/neutron
Background for this work can be read on the mailing list: http://lists.openstack.org/pipermail/openstack-dev/2016-May/094063.html Usage of the new Neutron is by setting the following in ENABLED_SERVICES: * neutron-api * neutron-l3 * neutron-agent * neutron-dhcp * neutron-metadata-agent For now, the new neutron library supports just the ML2 plugin, with the Open vSwitch and Linux Bridge agents supported. All other Neutron plugins should be creating their own DevStack plugin if they wish for DevStack to support them. Many of them already do. Other notable changes compared to neutron-legacy: * Rely on the Neutron defaults, and force Neutron to make sane defaults instead of all kinds of knobs in DevStack. * Default to rootwrap daemon support * Use the security group driver by default * interface_driver can now use NEUTRON_AGENT (linuxbridge, openvswitch), since they are entrypoints in neutron's setup.cfg * Use NEUTRON_AGENT variable to determine which agent to run Works with NEUTRON_AGENT set to either "linuxbridge" or "openvswitch" Default is openvswitch for the time being. * Set ML2 configuration for VXLAN support * Remove Xen hypervisor stuff - it should be a plugin * Move L3 crud into separate service file: There's a lot of L3 configuration that was in the main neutron file, but a lot of it is self contained and can be moved into its own file. The new l3 service file will contain all the previous L3 plumbing and configuration that the OpenStack Gate expects, while also eventually moving the whole l3 network creation step into a single hook that can be overridden by plugins. * Introduce a check for a function "neutron_plugin_create_initial_networks" which will become the mechanism through which different topologies, and networking plugins can create and wire the initial networks that are created during a stack.sh run. The new lib/neutron is considered experimental, and followup patches will build upon this one. Existing users of lib/neutron-legacy should remain unharmed. Co-Authored-By: Hirofumi Ichihara <[email protected]> Co-Authored-By: Dean Troyer <[email protected]> Change-Id: I31b6362c6d9992f425f2dedbbeff2568390a93da
1 parent 251b870 commit 2a24251

13 files changed

Lines changed: 977 additions & 415 deletions

File tree

‎clean.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ source $TOP_DIR/lib/nova
4949
source $TOP_DIR/lib/cinder
5050
source $TOP_DIR/lib/swift
5151
source $TOP_DIR/lib/heat
52+
source $TOP_DIR/lib/neutron
5253
source $TOP_DIR/lib/neutron-legacy
5354

5455
set -o xtrace

‎exercises/boot_from_volume.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ source $TOP_DIR/functions
3232

3333
# Import project functions
3434
source $TOP_DIR/lib/cinder
35+
source $TOP_DIR/lib/neutron
3536
source $TOP_DIR/lib/neutron-legacy
3637

3738
# Import configuration

‎exercises/floating_ips.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ source $TOP_DIR/functions
3131
source $TOP_DIR/openrc
3232

3333
# Import project functions
34+
source $TOP_DIR/lib/neutron
3435
source $TOP_DIR/lib/neutron-legacy
3536

3637
# Import exercise configuration

‎exercises/neutron-adv-test.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ source $TOP_DIR/functions
3737
source $TOP_DIR/openrc
3838

3939
# Import neutron functions
40+
source $TOP_DIR/lib/neutron
4041
source $TOP_DIR/lib/neutron-legacy
4142

4243
# If neutron is not enabled we exit with exitcode 55, which means exercise is skipped.

‎exercises/volumes.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ source $TOP_DIR/openrc
3232

3333
# Import project functions
3434
source $TOP_DIR/lib/cinder
35+
source $TOP_DIR/lib/neutron
3536
source $TOP_DIR/lib/neutron-legacy
3637

3738
# Import exercise configuration

0 commit comments

Comments
 (0)