openstack
/
charm-neutron-api
Code Issues Proposed changes

Merge "Mark min-l3-agents-per-router as deprecated for >= O"

This commit is contained in:
Zuul 2019-03-15 07:32:57 +00:00 committed by Gerrit Code Review
parent d97244b09a c9103a668a
commit e6f66cd15b
5 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.yaml
View File

@ -330,6 +330,9 @@ options:
description: |
Minimum number of l3 agents to host a router. Only used when enable-l3ha
is True.
.
NOTE: This option was deprecated in Newton and removed in Ocata so will
have no effect from then onwards.
allow-automatic-l3agent-failover:
type: boolean
default: False

1
templates/ocata/neutron.conf
View File

@ -27,7 +27,6 @@ dns_domain = {{ dns_domain }}
l3_ha = {{ l3_ha }}
{% if l3_ha -%}
max_l3_agents_per_router = {{ max_l3_agents_per_router }}
min_l3_agents_per_router = {{ min_l3_agents_per_router }}
{% endif -%}
allow_automatic_l3agent_failover = {{ allow_automatic_l3agent_failover }}

1
templates/pike/neutron.conf
View File

@ -27,7 +27,6 @@ dns_domain = {{ dns_domain }}
l3_ha = {{ l3_ha }}
{% if l3_ha -%}
max_l3_agents_per_router = {{ max_l3_agents_per_router }}
min_l3_agents_per_router = {{ min_l3_agents_per_router }}
{% endif -%}
allow_automatic_l3agent_failover = {{ allow_automatic_l3agent_failover }}

1
templates/queens/neutron.conf
View File

@ -27,7 +27,6 @@ dns_domain = {{ dns_domain }}
l3_ha = {{ l3_ha }}
{% if l3_ha -%}
max_l3_agents_per_router = {{ max_l3_agents_per_router }}
min_l3_agents_per_router = {{ min_l3_agents_per_router }}
{% endif -%}
allow_automatic_l3agent_failover = {{ allow_automatic_l3agent_failover }}

1
templates/rocky/neutron.conf
View File

@ -27,7 +27,6 @@ dns_domain = {{ dns_domain }}
l3_ha = {{ l3_ha }}
{% if l3_ha -%}
max_l3_agents_per_router = {{ max_l3_agents_per_router }}
min_l3_agents_per_router = {{ min_l3_agents_per_router }}
{% endif -%}
allow_automatic_l3agent_failover = {{ allow_automatic_l3agent_failover }}