Merge "NUMA aware vswitches"

puppet/services/nova-compute.yaml

@@ -154,6 +154,17 @@ parameters:
     default: '10'
     description: Max number of consecutive build failures before the nova-compute will disable itself.
     type: string
+  NeutronPhysnetNUMANodesMapping:
+    description: |
+      Map of physnet name as key and NUMA nodes as value.
+      Ex. NeutronPhysnetNUMANodesMapping: {'foo': [0, 1], 'bar': [1]} where `foo` and `bar` are
+      physnet names and corresponding values are list of associated numa_nodes.
+    type: json
+    default: {}
+  NeutronTunnelNUMANodes:
+    description: Used to configure NUMA affinity for all tunneled networks.
+    type: comma_delimited_list
+    default: []
 
 conditions:
   enable_live_migration_tunnelled:
@@ -184,11 +195,16 @@ resources:
             - nova::compute::vcpu_pin_set: NovaVcpuPinSet
               nova::compute::cpu_shared_set: NovaComputeCpuSharedSet
               nova::compute::reserved_host_memory: NovaReservedHostMemory
+              nova::compute::neutron_physnets_numa_nodes_mapping: NeutronPhysnetNUMANodesMapping
+              nova::compute::neutron_tunnel_numa_nodes: NeutronTunnelNUMANodes
             - values: {get_param: [RoleParameters]}
           - values:
               NovaVcpuPinSet: {get_param: NovaVcpuPinSet}
               NovaComputeCpuSharedSet: {get_param: NovaComputeCpuSharedSet}
               NovaReservedHostMemory: {get_param: NovaReservedHostMemory}
+              NeutronPhysnetNUMANodesMapping: {get_param: NeutronPhysnetNUMANodesMapping}
+              NeutronTunnelNUMANodes: {get_param: NeutronTunnelNUMANodes}
+
 
 outputs:
   role_data:

releasenotes/notes/numa-aware-vswitches-cd8df5dd9b725230.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Add parameters `NeutronPhysnetNUMANodesMapping` and `NeutronTunnelNUMANodes`
+    to provide numa affinity for physnets attached to vswitches.