openstack/kolla-ansible
Code Issues Proposed changes

Remove min_l3_agents_per_router option

Browse Source 
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
This commit is contained in:
ZhongShengping 2017-03-29 11:28:01 +08:00
parent 04ebda9e44
commit 66ac7aa459
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/neutron/defaults/main.yml
View File

@ -293,7 +293,6 @@ openvswitch_vswitchd_image_full: "{{ openvswitch_vswitchd_image }}:{{ openvswitc
# OpenStack # OpenStack
#################### ####################
dhcp_agents_per_network: 2 dhcp_agents_per_network: 2
min_l3_agents_per_router: 2
max_l3_agents_per_router: 3 max_l3_agents_per_router: 3
neutron_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ neutron_server_port }}" neutron_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ neutron_server_port }}"

1
ansible/roles/neutron/templates/neutron.conf.j2
View File

@ -42,7 +42,6 @@ service_plugins = {{ neutron_service_plugins|map(attribute='name')|join(',') }}
dhcp_agents_per_network = {{ dhcp_agents_per_network }} dhcp_agents_per_network = {{ dhcp_agents_per_network }}
l3_ha = true l3_ha = true
max_l3_agents_per_router = {{ max_l3_agents_per_router }} max_l3_agents_per_router = {{ max_l3_agents_per_router }}
min_l3_agents_per_router = {{ min_l3_agents_per_router }}
{% endif %} {% 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 %} 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 %}