From 66ac7aa4593f17d3a6ba13137526ba296ce043fb Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 29 Mar 2017 11:28:01 +0800 Subject: [PATCH] Remove min_l3_agents_per_router option min_l3_agents_per_router parameter has been removed in neutron[0]. So we can remove it. [0] https://github.com/openstack/neutron/blob/master/releasenotes/notes/remove-min-l3-agents-per-router-27aef7d91dec0348.yaml Change-Id: Ia3f3686e2cc27e4bd0707add50ebc552117d6b03 Closes-Bug: #1677101 --- ansible/roles/neutron/defaults/main.yml | 1 - ansible/roles/neutron/templates/neutron.conf.j2 | 1 - 2 files changed, 2 deletions(-) diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index 37ffc108d6..da17f3291b 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/ansible/roles/neutron/defaults/main.yml @@ -293,7 +293,6 @@ openvswitch_vswitchd_image_full: "{{ openvswitch_vswitchd_image }}:{{ openvswitc # OpenStack #################### dhcp_agents_per_network: 2 -min_l3_agents_per_router: 2 max_l3_agents_per_router: 3 neutron_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ neutron_server_port }}" diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index eed201f6d2..223f1c44a9 100644 --- a/ansible/roles/neutron/templates/neutron.conf.j2 +++ b/ansible/roles/neutron/templates/neutron.conf.j2 @@ -42,7 +42,6 @@ service_plugins = {{ neutron_service_plugins|map(attribute='name')|join(',') }} dhcp_agents_per_network = {{ dhcp_agents_per_network }} l3_ha = true max_l3_agents_per_router = {{ max_l3_agents_per_router }} -min_l3_agents_per_router = {{ min_l3_agents_per_router }} {% endif %} transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{% if orchestration_engine == 'KUBERNETES' %}rabbitmq{% else %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{% endif %}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}