Add network types used by midonet

Don't enable them unless explicitly configured in local_settings.

Closes-Bug: #1504466
Related-Bug: #1486943
Change-Id: Ia1c059dfa80a55d10fb0318b1648f41ac24cea17
This commit is contained in:
YAMAMOTO Takashi 2015-10-09 18:22:32 +09:00 committed by Akihiro Motoki
parent 23d5b3aa32
commit a968f9a500
3 changed files with 18 additions and 2 deletions

View File

@ -1194,9 +1194,10 @@ provider network types are supported. Only the network types in this list will
be available to choose from when creating a network.
Network types defined in Horizon or defined in ``extra_provider_types``
settings can be specified in this list.
As of the Liberty release, the network types defined in Horizon include
As of the Newton release, the network types defined in Horizon include
network types supported by Neutron ML2 plugin with Open vSwitch driver
(``local``, ``flat``, ``vlan``, ``gre``, and ``vxlan``).
(``local``, ``flat``, ``vlan``, ``gre``, and ``vxlan``)
and supported by Midonet plugin (``midonet`` and ``uplink``).
``["*"]`` means that all provider network types supported by Neutron
ML2 plugin will be available to choose from.

View File

@ -56,6 +56,16 @@ PROVIDER_TYPES = {
'require_physical_network': False,
'require_segmentation_id': True,
},
'midonet': {
'display_name': _('MidoNet'),
'require_physical_network': False,
'require_segmentation_id': False,
},
'uplink': {
'display_name': _('MidoNet Uplink'),
'require_physical_network': False,
'require_segmentation_id': False,
},
}
# Predefined valid segmentation ID range per network type.
# You can add or override these entries by segmentation_id_range

View File

@ -0,0 +1,5 @@
---
features:
- Neutron provider network types for Midonet are now supported.
To enable them, specify these network types in
``supported_provider_types`` in the configuration file.