openstack/kolla-ansible
Code Issues Proposed changes

Merge "Limit open file descriptors for Neutron agent containers"

Browse Source
This commit is contained in:
Zuul 2019-10-24 11:16:39 +00:00 committed by Gerrit Code Review
commit 8915d8a538
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,17 +218,29 @@ ironic_neutron_agent_image: "{{ docker_registry ~ '/' if docker_registry else ''
ironic_neutron_agent_tag: "{{ neutron_tag }}" ironic_neutron_agent_tag: "{{ neutron_tag }}"
ironic_neutron_agent_image_full: "{{ ironic_neutron_agent_image }}:{{ ironic_neutron_agent_tag }}" ironic_neutron_agent_image_full: "{{ ironic_neutron_agent_image }}:{{ ironic_neutron_agent_tag }}"
neutron_dhcp_agent_dimensions: "{{ default_container_dimensions }}" # TODO(wszumski): This is a workaround for: https://bugs.launchpad.net/oslo.rootwrap/+bug/1760471
neutron_l3_agent_dimensions: "{{ default_container_dimensions }}" # and should be removed once we use python 3 for all distibutions.
neutron_sriov_agent_dimensions: "{{ default_container_dimensions }}" neutron_agent_dimensions_python2:
neutron_linuxbridge_agent_dimensions: "{{ default_container_dimensions }}" # Values taken from TripleO: https://review.opendev.org/#/c/651137/
neutron_metadata_agent_dimensions: "{{ default_container_dimensions }}" ulimits:
neutron_openvswitch_agent_dimensions: "{{ default_container_dimensions }}" nofile:
soft: 16384
hard: 16384
neutron_agent_dimensions: >-
{{ default_container_dimensions | combine(neutron_agent_dimensions_python2 if distro_python_version | version_compare('3.0', '<') else {}) }}
neutron_dhcp_agent_dimensions: "{{ neutron_agent_dimensions }}"
neutron_l3_agent_dimensions: "{{ neutron_agent_dimensions }}"
neutron_sriov_agent_dimensions: "{{ neutron_agent_dimensions }}"
neutron_linuxbridge_agent_dimensions: "{{ neutron_agent_dimensions }}"
neutron_metadata_agent_dimensions: "{{ neutron_agent_dimensions }}"
neutron_openvswitch_agent_dimensions: "{{ neutron_agent_dimensions }}"
neutron_server_dimensions: "{{ default_container_dimensions }}" neutron_server_dimensions: "{{ default_container_dimensions }}"
neutron_bgp_dragent_dimensions: "{{ default_container_dimensions }}" neutron_bgp_dragent_dimensions: "{{ default_container_dimensions }}"
neutron_infoblox_ipam_agent_dimensions: "{{ default_container_dimensions }}" neutron_infoblox_ipam_agent_dimensions: "{{ default_container_dimensions }}"
neutron_openvswitch_agent_xenapi_dimensions: "{{ default_container_dimensions }}" neutron_openvswitch_agent_xenapi_dimensions: "{{ neutron_agent_dimensions }}"
neutron_metering_agent_dimensions: "{{ default_container_dimensions }}" neutron_metering_agent_dimensions: "{{ neutron_agent_dimensions }}"
ironic_neutron_agent_dimensions: "{{ default_container_dimensions }}" ironic_neutron_agent_dimensions: "{{ default_container_dimensions }}"