From ae1b96114679035c37e0350d3fde032ad4beccce Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Tue, 5 Dec 2017 08:23:31 +0000 Subject: [PATCH] Handle Pike changes for Neutron - Updated default quotas to match Neutron upstream. - Renamed configuration options to match upstream - Removed deprecations Change-Id: I2e5a2ad84fdaa0caee81ee2b63eb9897465d6345 --- defaults/main.yml | 10 +++++----- .../notes/new_default_quotas-154f76dd7f2f568f.yaml | 6 ++++++ templates/l3_agent.ini.j2 | 6 ------ templates/neutron-ha-tool.py.j2 | 2 -- 4 files changed, 11 insertions(+), 13 deletions(-) create mode 100644 releasenotes/notes/new_default_quotas-154f76dd7f2f568f.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 514105fb..d404b22e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -82,6 +82,8 @@ neutron_agent_down_time: 120 neutron_agent_polling_interval: 5 neutron_report_interval: "{{ neutron_agent_down_time | int / 2 | int }}" +# TODO(evrardjp): Remove this when vpnaas/Dragonflow don't use it anymore. +# This was deprecated in Pike cycle. neutron_external_network_bridge: "" neutron_dns_domain: "openstacklocal." @@ -157,15 +159,15 @@ neutron_default_quota: -1 neutron_quota_floatingip: 50 neutron_quota_health_monitor: -1 neutron_quota_member: -1 -neutron_quota_network: 10 +neutron_quota_network: 100 neutron_quota_network_gateway: 5 neutron_quota_packet_filter: 100 neutron_quota_pool: 10 -neutron_quota_port: 50 +neutron_quota_port: 500 neutron_quota_router: 10 neutron_quota_security_group: 10 neutron_quota_security_group_rule: 100 -neutron_quota_subnet: 10 +neutron_quota_subnet: 100 neutron_quota_vip: 10 ### @@ -305,8 +307,6 @@ neutron_local_ip: 127.0.0.1 ### L3 Agent Plugin Configuration ### -neutron_gateway_external_network_id: "" - # Set this option to "true" to enable legacy neutron L3HA tool support # TODO(cloudnull): Remove this in the Ocata cycle neutron_legacy_ha_tool_enabled: false diff --git a/releasenotes/notes/new_default_quotas-154f76dd7f2f568f.yaml b/releasenotes/notes/new_default_quotas-154f76dd7f2f568f.yaml new file mode 100644 index 00000000..7ef42d94 --- /dev/null +++ b/releasenotes/notes/new_default_quotas-154f76dd7f2f568f.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Default quotas were bumped for the following resources: + networks (from 10 to 100), subnets (from 10 to 100), ports (from 50 to + 500) to match upstream defaults. diff --git a/templates/l3_agent.ini.j2 b/templates/l3_agent.ini.j2 index 69578910..f8897309 100644 --- a/templates/l3_agent.ini.j2 +++ b/templates/l3_agent.ini.j2 @@ -4,12 +4,6 @@ [DEFAULT] debug = {{ debug }} -# While this option is deprecated in Liberty, if we remove it then it takes -# a default value of 'br-ex', which we do not want. We therefore leave it -# in place for now and can remove it in Mitaka. -external_network_bridge = {{ neutron_external_network_bridge }} -gateway_external_network_id = {{ neutron_gateway_external_network_id }} - # Drivers interface_driver = {{ neutron_plugins[neutron_plugin_type].driver_interface }} diff --git a/templates/neutron-ha-tool.py.j2 b/templates/neutron-ha-tool.py.j2 index 806ae82d..ce3ec4ab 100644 --- a/templates/neutron-ha-tool.py.j2 +++ b/templates/neutron-ha-tool.py.j2 @@ -219,7 +219,6 @@ def l3_agent_rebalance(qclient, noop=False): # u'id': u'6efe494a-616c-41ea-9c8f-2c592f4d46ff', # u'configurations': { # u'router_id': u'', - # u'gateway_external_network_id': u'', # u'handle_internal_only_routers': True, # u'use_namespaces': True, # u'routers': 5, @@ -570,7 +569,6 @@ def list_agents(qclient, agent_type=None): # u'id': u'6efe494a-616c-41ea-9c8f-2c592f4d46ff', # u'configurations': { # u'router_id': u'', - # u'gateway_external_network_id': u'', # u'handle_internal_only_routers': True, # u'use_namespaces': True, # u'routers': 5,