Merge "Example configurable cap add" into stable/ussuri

deployment/metrics/collectd-container-puppet.yaml

@@ -382,6 +382,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:
@@ -711,7 +717,9 @@ outputs:
             restart: always
             mem_limit: 512m
             cap_add:
-              - IPC_LOCK
+              list_concat:
+                - {get_param: CollectdContainerAdditionalCapAdd}
+                - [IPC_LOCK]
             healthcheck:
               test: /openstack/healthcheck
             volumes: