Merge "[TRAIN and before] Introduce ContainerCpusetCpus" into stable/stein

deployment/nova/nova-libvirt-container-puppet.yaml

@@ -225,6 +225,12 @@ parameters:
       Override the compile time default TLS priority string.
     type: string
     default: 'NORMAL:-VERS-SSL3.0:-VERS-TLS-ALL:+VERS-TLS1.2'
+  ContainerCpusetCpus:
+    description: Limit the specific CPUs or cores a container can use.
+    type: string
+    default: 'all'
+    tags:
+      - role_specific
 
 conditions:
 
@@ -323,10 +329,12 @@ resources:
           - map_replace:
             - vhostuser_socket_group: VhostuserSocketGroup
               nova::compute::libvirt::qemu::memory_backing_dir: QemuMemoryBackingDir
+              container_cpuset_cpus: ContainerCpusetCpus
             - values: {get_param: [RoleParameters]}
           - values:
               VhostuserSocketGroup: {get_param: VhostuserSocketGroup}
               QemuMemoryBackingDir: {get_param: QemuMemoryBackingDir}
+              ContainerCpusetCpus: {get_param: ContainerCpusetCpus}
 
 
   ContainersCommon:
@@ -679,7 +687,7 @@ outputs:
             privileged: true
             security_opt: label=disable
             restart: always
-            cpuset_cpus: all
+            cpuset_cpus: {get_attr: [RoleParametersValue, value, container_cpuset_cpus]}
             depends_on:
               - tripleo_nova_virtlogd
             healthcheck:

releasenotes/notes/cpuset_cpus-4dbde2cec2152b30.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Add a role specific parameter, ContainerCpusetCpus, default to 'all', which
+    allows to limit the specific CPUs or cores a container can use.
+    To disable it and rely on container engine default, set it to ''.