Merge "Set ulimit for nova-compute and cinder-volume"
This commit is contained in:
commit
83fdc0b30b
|
@ -10,6 +10,10 @@ parameters:
|
||||||
DockerCinderConfigImage:
|
DockerCinderConfigImage:
|
||||||
description: The container image to use for the cinder config_volume
|
description: The container image to use for the cinder config_volume
|
||||||
type: string
|
type: string
|
||||||
|
DockerCinderVolumeUlimit:
|
||||||
|
default: ['nofile=131072']
|
||||||
|
description: ulimit for Cinder Volume Container
|
||||||
|
type: comma_delimited_list
|
||||||
EndpointMap:
|
EndpointMap:
|
||||||
default: {}
|
default: {}
|
||||||
description: Mapping of service endpoint -> protocol. Typically set
|
description: Mapping of service endpoint -> protocol. Typically set
|
||||||
|
@ -147,6 +151,7 @@ outputs:
|
||||||
step_4:
|
step_4:
|
||||||
cinder_volume:
|
cinder_volume:
|
||||||
image: *cinder_volume_image
|
image: *cinder_volume_image
|
||||||
|
ulimit: {get_param: DockerCinderVolumeUlimit}
|
||||||
ipc: host
|
ipc: host
|
||||||
net: host
|
net: host
|
||||||
privileged: true
|
privileged: true
|
||||||
|
|
|
@ -10,6 +10,10 @@ parameters:
|
||||||
DockerNeutronConfigImage:
|
DockerNeutronConfigImage:
|
||||||
description: The container image to use for the neutron config_volume
|
description: The container image to use for the neutron config_volume
|
||||||
type: string
|
type: string
|
||||||
|
DockerNeutronDHCPAgentUlimit:
|
||||||
|
default: ['nofile=1024']
|
||||||
|
description: ulimit for Neutron DHCP Agent Container
|
||||||
|
type: comma_delimited_list
|
||||||
EndpointMap:
|
EndpointMap:
|
||||||
default: {}
|
default: {}
|
||||||
description: Mapping of service endpoint -> protocol. Typically set
|
description: Mapping of service endpoint -> protocol. Typically set
|
||||||
|
@ -126,7 +130,7 @@ outputs:
|
||||||
restart: always
|
restart: always
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: /openstack/healthcheck
|
test: /openstack/healthcheck
|
||||||
ulimit: ['nofile=1024']
|
ulimit: {get_param: DockerNeutronDHCPAgentUlimit}
|
||||||
volumes:
|
volumes:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
|
|
|
@ -10,6 +10,10 @@ parameters:
|
||||||
DockerNeutronConfigImage:
|
DockerNeutronConfigImage:
|
||||||
description: The container image to use for the neutron config_volume
|
description: The container image to use for the neutron config_volume
|
||||||
type: string
|
type: string
|
||||||
|
DockerNeutronL3AgentUlimit:
|
||||||
|
default: ['nofile=1024']
|
||||||
|
description: ulimit for Neutron L3 Agent Container
|
||||||
|
type: comma_delimited_list
|
||||||
ServiceData:
|
ServiceData:
|
||||||
default: {}
|
default: {}
|
||||||
description: Dictionary packing service data
|
description: Dictionary packing service data
|
||||||
|
@ -104,7 +108,7 @@ outputs:
|
||||||
restart: always
|
restart: always
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: /openstack/healthcheck
|
test: /openstack/healthcheck
|
||||||
ulimit: ['nofile=1024']
|
ulimit: {get_param: DockerNeutronL3AgentUlimit}
|
||||||
volumes:
|
volumes:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
|
|
|
@ -10,6 +10,10 @@ parameters:
|
||||||
DockerNeutronConfigImage:
|
DockerNeutronConfigImage:
|
||||||
description: The container image to use for the neutron config_volume
|
description: The container image to use for the neutron config_volume
|
||||||
type: string
|
type: string
|
||||||
|
DockerOpenvswitchUlimit:
|
||||||
|
default: ['nofile=1024']
|
||||||
|
description: ulimit for Openvswitch Container
|
||||||
|
type: comma_delimited_list
|
||||||
ServiceData:
|
ServiceData:
|
||||||
default: {}
|
default: {}
|
||||||
description: Dictionary packing service data
|
description: Dictionary packing service data
|
||||||
|
@ -148,7 +152,7 @@ outputs:
|
||||||
restart: always
|
restart: always
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: /openstack/healthcheck
|
test: /openstack/healthcheck
|
||||||
ulimit: ['nofile=1024']
|
ulimit: {get_param: DockerOpenvswitchUlimit}
|
||||||
volumes:
|
volumes:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
|
|
|
@ -10,6 +10,10 @@ parameters:
|
||||||
DockerNovaLibvirtConfigImage:
|
DockerNovaLibvirtConfigImage:
|
||||||
description: The container image to use for the nova_libvirt config_volume
|
description: The container image to use for the nova_libvirt config_volume
|
||||||
type: string
|
type: string
|
||||||
|
DockerNovaComputeUlimit:
|
||||||
|
default: ['nofile=1024']
|
||||||
|
description: ulimit for Nova Compute Container
|
||||||
|
type: comma_delimited_list
|
||||||
ServiceData:
|
ServiceData:
|
||||||
default: {}
|
default: {}
|
||||||
description: Dictionary packing service data
|
description: Dictionary packing service data
|
||||||
|
@ -155,6 +159,7 @@ outputs:
|
||||||
step_4:
|
step_4:
|
||||||
nova_compute:
|
nova_compute:
|
||||||
image: &nova_compute_image {get_param: DockerNovaComputeImage}
|
image: &nova_compute_image {get_param: DockerNovaComputeImage}
|
||||||
|
ulimit: {get_param: DockerNovaComputeUlimit}
|
||||||
ipc: host
|
ipc: host
|
||||||
net: host
|
net: host
|
||||||
privileged: true
|
privileged: true
|
||||||
|
|
|
@ -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…
Reference in New Issue