diff --git a/deployment/metrics/collectd-container-ansible.yaml b/deployment/metrics/collectd-container-ansible.yaml index 50393fda25..afab63115a 100644 --- a/deployment/metrics/collectd-container-ansible.yaml +++ b/deployment/metrics/collectd-container-ansible.yaml @@ -280,7 +280,11 @@ parameters: type: boolean description: Set to true if collectd should run the libpodstats plugin default: false - + CollectdContainerAdditionalCapAdd: + type: comma_delimited_list + description: Additional container capabilities to add to the collectd container. + By default is appended to IPC_LOCK. + default: [] CollectdVars: default: {} description: Hash of collectd variables used to configure the collectd role. @@ -391,7 +395,9 @@ outputs: user: root restart: always cap_add: - - IPC_LOCK + list_concat: + - {get_param: CollectdContainerAdditionalCapAdd} + - [IPC_LOCK] healthcheck: test: /openstack/healthcheck volumes: diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml index f2bbeea736..e5f2136db5 100644 --- a/deployment/metrics/collectd-container-puppet.yaml +++ b/deployment/metrics/collectd-container-puppet.yaml @@ -395,6 +395,12 @@ parameters: type: boolean description: Set to true if collectd should run the libpodstats plugin default: false + CollectdContainerAdditionalCapAdd: + type: comma_delimited_list + description: Additional container capabilities to add to the collectd container. + By default is appended to IPC_LOCK. + default: [] + conditions: amqp_connection: @@ -713,7 +719,9 @@ outputs: restart: always mem_limit: 512m cap_add: - - IPC_LOCK + list_concat: + - {get_param: CollectdContainerAdditionalCapAdd} + - [IPC_LOCK] healthcheck: test: /openstack/healthcheck volumes: