From a968f9a5001d12f6df5fc06134fbafe2197985f8 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 9 Oct 2015 18:22:32 +0900 Subject: [PATCH] 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 --- doc/source/topics/settings.rst | 5 +++-- openstack_dashboard/dashboards/admin/networks/forms.py | 10 ++++++++++ .../notes/network-type-midonet-6c78bdfe1e3186a0.yaml | 5 +++++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/network-type-midonet-6c78bdfe1e3186a0.yaml diff --git a/doc/source/topics/settings.rst b/doc/source/topics/settings.rst index 1d3fb2dfe..4571f72f3 100644 --- a/doc/source/topics/settings.rst +++ b/doc/source/topics/settings.rst @@ -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. diff --git a/openstack_dashboard/dashboards/admin/networks/forms.py b/openstack_dashboard/dashboards/admin/networks/forms.py index f5143283e..c10a2c511 100644 --- a/openstack_dashboard/dashboards/admin/networks/forms.py +++ b/openstack_dashboard/dashboards/admin/networks/forms.py @@ -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 diff --git a/releasenotes/notes/network-type-midonet-6c78bdfe1e3186a0.yaml b/releasenotes/notes/network-type-midonet-6c78bdfe1e3186a0.yaml new file mode 100644 index 000000000..2fd1e4d31 --- /dev/null +++ b/releasenotes/notes/network-type-midonet-6c78bdfe1e3186a0.yaml @@ -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.