Browse Source

Merge "Set ulimit for nova-compute and cinder-volume"

changes/02/561202/1
Zuul 4 years ago committed by Gerrit Code Review
parent
commit
83fdc0b30b
  1. 5
      docker/services/cinder-volume.yaml
  2. 6
      docker/services/neutron-dhcp.yaml
  3. 6
      docker/services/neutron-l3.yaml
  4. 6
      docker/services/neutron-ovs-agent.yaml
  5. 5
      docker/services/nova-compute.yaml
  6. 15
      releasenotes/notes/add_params_to_configure_ulimit-2359aa058da58054.yaml

5
docker/services/cinder-volume.yaml

@ -10,6 +10,10 @@ parameters:
DockerCinderConfigImage:
description: The container image to use for the cinder config_volume
type: string
DockerCinderVolumeUlimit:
default: ['nofile=131072']
description: ulimit for Cinder Volume Container
type: comma_delimited_list
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -147,6 +151,7 @@ outputs:
step_4:
cinder_volume:
image: *cinder_volume_image
ulimit: {get_param: DockerCinderVolumeUlimit}
ipc: host
net: host
privileged: true

6
docker/services/neutron-dhcp.yaml

@ -10,6 +10,10 @@ parameters:
DockerNeutronConfigImage:
description: The container image to use for the neutron config_volume
type: string
DockerNeutronDHCPAgentUlimit:
default: ['nofile=1024']
description: ulimit for Neutron DHCP Agent Container
type: comma_delimited_list
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -126,7 +130,7 @@ outputs:
restart: always
healthcheck:
test: /openstack/healthcheck
ulimit: ['nofile=1024']
ulimit: {get_param: DockerNeutronDHCPAgentUlimit}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

6
docker/services/neutron-l3.yaml

@ -10,6 +10,10 @@ parameters:
DockerNeutronConfigImage:
description: The container image to use for the neutron config_volume
type: string
DockerNeutronL3AgentUlimit:
default: ['nofile=1024']
description: ulimit for Neutron L3 Agent Container
type: comma_delimited_list
ServiceData:
default: {}
description: Dictionary packing service data
@ -104,7 +108,7 @@ outputs:
restart: always
healthcheck:
test: /openstack/healthcheck
ulimit: ['nofile=1024']
ulimit: {get_param: DockerNeutronL3AgentUlimit}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

6
docker/services/neutron-ovs-agent.yaml

@ -10,6 +10,10 @@ parameters:
DockerNeutronConfigImage:
description: The container image to use for the neutron config_volume
type: string
DockerOpenvswitchUlimit:
default: ['nofile=1024']
description: ulimit for Openvswitch Container
type: comma_delimited_list
ServiceData:
default: {}
description: Dictionary packing service data
@ -148,7 +152,7 @@ outputs:
restart: always
healthcheck:
test: /openstack/healthcheck
ulimit: ['nofile=1024']
ulimit: {get_param: DockerOpenvswitchUlimit}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

5
docker/services/nova-compute.yaml

@ -10,6 +10,10 @@ parameters:
DockerNovaLibvirtConfigImage:
description: The container image to use for the nova_libvirt config_volume
type: string
DockerNovaComputeUlimit:
default: ['nofile=1024']
description: ulimit for Nova Compute Container
type: comma_delimited_list
ServiceData:
default: {}
description: Dictionary packing service data
@ -155,6 +159,7 @@ outputs:
step_4:
nova_compute:
image: &nova_compute_image {get_param: DockerNovaComputeImage}
ulimit: {get_param: DockerNovaComputeUlimit}
ipc: host
net: host
privileged: true

15
releasenotes/notes/add_params_to_configure_ulimit-2359aa058da58054.yaml

@ -0,0 +1,15 @@
---
features:
- |
Add Parameters to Configure Ulimit for Containers.
These parameters can be used to configure ulimit
per container basis as per the requirement of the
deployment.
Following parameters are added for neutron, nova
and cinder:-
- DockerNeutronDHCPAgentUlimit defaults to nofile=1024
- DockerNeutronL3AgentUlimit defaults to nofile=1024
- DockerOpenvswitchUlimit defaults to nofile=1024
- DockerNovaComputeUlimit defaults to nofile=1024
- DockerCinderVolumeUlimit defaults to nofile=131072
Loading…
Cancel
Save