Merge "Enable OPENSTACK_NEUTRON_NETWORK[enable_quotas] by default"

doc/source/configuration/settings.rst

@@ -1734,7 +1734,7 @@ Default:
         'enable_fip_topology_check': True,
         'enable_ha_router': False,
         'enable_ipv6': True,
-        'enable_quotas': False,
+        'enable_quotas': True,
         'enable_rbac_policy': True,
         'enable_router': True,
         'extra_provider_types': {},
@@ -1834,7 +1834,11 @@ will only expose IPv4 configuration for networks.
 enable_quotas
 #############
 
-Default: ``False``
+.. versionchanged:: 17.0.0(Ussuri)
+
+   The default value was changed to ``True``
+
+Default: ``True``
 
 Enable support for Neutron quotas feature. To make this feature work
 appropriately, you need to use Neutron plugins with quotas extension support

openstack_dashboard/defaults.py

@@ -398,8 +398,7 @@ OPENSTACK_NEUTRON_NETWORK = {
     'enable_fip_topology_check': True,
     'enable_ha_router': False,
     'enable_ipv6': True,
-    # TODO(amotoki): Change the default value to True? See local_settings.py
+    'enable_quotas': True,
-    'enable_quotas': False,
     'enable_rbac_policy': True,
     'enable_router': True,
 

openstack_dashboard/local/local_settings.py.example

@@ -120,30 +120,6 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 OPENSTACK_HOST = "127.0.0.1"
 OPENSTACK_KEYSTONE_URL = "http://%s:5000/v3" % OPENSTACK_HOST
 
-# The OPENSTACK_NEUTRON_NETWORK settings can be used to enable optional
-# services provided by neutron. Options currently available are load
-# balancer service, security groups, quotas, VPN service.
-OPENSTACK_NEUTRON_NETWORK = {
-    'enable_auto_allocated_network': False,
-    'enable_distributed_router': False,
-    'enable_fip_topology_check': True,
-    'enable_ha_router': False,
-    'enable_ipv6': True,
-    # TODO(amotoki): Drop OPENSTACK_NEUTRON_NETWORK completely from here.
-    # enable_quotas has the different default value here.
-    'enable_quotas': True,
-    'enable_rbac_policy': True,
-    'enable_router': True,
-
-    'default_dns_nameservers': [],
-    'supported_provider_types': ['*'],
-    'segmentation_id_range': {},
-    'extra_provider_types': {},
-    'supported_vnic_types': ['*'],
-    'physical_networks': [],
-
-}
-
 # The timezone of the server. This should correspond with the timezone
 # of your entire OpenStack installation, and hopefully be in UTC.
 TIME_ZONE = "UTC"

releasenotes/notes/enable-neutron-quotas-by-default-7c89cda96a972a48.yaml

@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    ``enable_quotas`` in ``OPENSTACK_NEUTRON_NETWORK`` is now enabled
+    by default. Neutron provides the quotas API for long and most horizon
+    deployments are expected to enable this, so the feature is enabled
+    by default. If your deployment disables the neutron quotas support,
+    make sure to set this value to ``False``.