diff --git a/config.yaml b/config.yaml index 552b8b81..80cdb2a9 100755 --- a/config.yaml +++ b/config.yaml @@ -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 diff --git a/templates/ocata/neutron.conf b/templates/ocata/neutron.conf index 79b54eef..f572756a 100644 --- a/templates/ocata/neutron.conf +++ b/templates/ocata/neutron.conf @@ -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 }} diff --git a/templates/pike/neutron.conf b/templates/pike/neutron.conf index 4f29d9f0..09a795fa 100644 --- a/templates/pike/neutron.conf +++ b/templates/pike/neutron.conf @@ -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 }} diff --git a/templates/queens/neutron.conf b/templates/queens/neutron.conf index 6fc1151a..4fb19b43 100644 --- a/templates/queens/neutron.conf +++ b/templates/queens/neutron.conf @@ -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 }} diff --git a/templates/rocky/neutron.conf b/templates/rocky/neutron.conf index c483ea80..fb67d064 100644 --- a/templates/rocky/neutron.conf +++ b/templates/rocky/neutron.conf @@ -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 }}