From 5a68857bfc39bf833facbe76d1fe01ea43df876f Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Mon, 29 Feb 2016 18:05:49 +0100 Subject: [PATCH] Deprecate default_*_subnet_pool_label options Starting with Mitaka, Neutron API handing of default subnetpool has changed [1]. If a default subnetpool exists in Neutron it will show up in the subnetpool list. Thus no change in Horizon is needed to handle this part. The following changes are required in Horizon: - Mark the 'default_ipv4_subnet_pool_label' and 'default_ipv6_subnet_pool_label' configuration options for use with Liberty only, deprecate them and tag them for removal in future release. - When the configuration options are removed the _check_subnet_data function should no longer allow to pass empty 'cidr' and 'subnetpool_id'. References: 1: http://docs.openstack.org/releasenotes/neutron/unreleased.html Change-Id: Ib1d4143251421d03e4e9c3071d43d2423e3b0d8c Closes-Bug: #1551333 --- doc/source/topics/settings.rst | 15 ++++++++++++--- ...ubnet-pool-label-options-b05ebccbf6f68ecf.yaml | 7 +++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/deprecation-of-default-subnet-pool-label-options-b05ebccbf6f68ecf.yaml diff --git a/doc/source/topics/settings.rst b/doc/source/topics/settings.rst index 95774491c..6c0810d74 100644 --- a/doc/source/topics/settings.rst +++ b/doc/source/topics/settings.rst @@ -1024,8 +1024,6 @@ Default:: 'supported_vnic_types': ["*"], 'segmentation_id_range': {}, 'enable_fip_topology_check': True, - 'default_ipv4_subnet_pool_label': None, - 'default_ipv6_subnet_pool_label': None, } A dictionary of settings which can be used to enable optional services provided @@ -1219,6 +1217,11 @@ Neutron can be configured with a default Subnet Pool to be used for IPv4 subnet-allocation. Specify the label you wish to display in the Address pool selector on the create subnet step if you want to use this feature. +This option is now marked as "deprecated" and will be removed in Newton or +a later release. If there exists a default Subnet Pool it will be automatically +detected through the Neutron API and the label will be set to the name of the +default Subnet Pool. + ``default_ipv6_subnet_pool_label`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1230,7 +1233,13 @@ Neutron can be configured with a default Subnet Pool to be used for IPv6 subnet-allocation. Specify the label you wish to display in the Address pool selector on the create subnet step if you want to use this feature. -You must set this to enable IPv6 Prefix Delegation in a PD-capable environment. +When using Liberty Neutron you must set this to enable IPv6 Prefix Delegation +in a PD-capable environment. + +This option is now marked as "deprecated" and will be removed in Newton or +a later release. If there exists a default Subnet Pool it will be automatically +detected through the Neutron API and the label will be set to the name of the +default Subnet Pool. ``OPENSTACK_SSL_CACERT`` ------------------------ diff --git a/releasenotes/notes/deprecation-of-default-subnet-pool-label-options-b05ebccbf6f68ecf.yaml b/releasenotes/notes/deprecation-of-default-subnet-pool-label-options-b05ebccbf6f68ecf.yaml new file mode 100644 index 000000000..6d56f7d8d --- /dev/null +++ b/releasenotes/notes/deprecation-of-default-subnet-pool-label-options-b05ebccbf6f68ecf.yaml @@ -0,0 +1,7 @@ +--- +deprecations: + - The 'default_ipv4_subnet_pool_label' and 'default_ipv6_subnet_pool_label' + options has been deprecated and will be removed in the Newton release. + Starting with Mitaka you can create one default subnet pool per address + family through the Neutron API. These subnet pools will automatically + show up in the subnet pool list using the name of the pool as label.