Merge "Add CPU thread pinning to metadata defs"

etc/metadefs/compute-cpu-pinning.json

@@ -1,7 +1,7 @@
 {
     "namespace": "OS::Compute::CPUPinning",
     "display_name": "CPU Pinning",
-    "description": "This provides the preferred CPU Pinning policy when pinning vCPU of the guest to pCPU of the host. Default 'shared' option doesn't change current default guest CPU placement policy. 'Dedicated' will make guest CPU(s) to be strictly pinned to set of host CPU(s). See also https://wiki.openstack.org/wiki/VirtDriverGuestCPUMemoryPlacement",
+    "description": "This provides the preferred CPU pinning and CPU thread pinning policy to be used when pinning vCPU of the guest to pCPU of the host. See http://docs.openstack.org/admin-guide/compute-numa-cpu-pinning.html",
     "visibility": "public",
     "protected": true,
     "resource_type_associations": [
@@ -22,12 +22,22 @@
     "properties": {
         "cpu_policy": {
             "title": "CPU Pinning policy",
-            "description": "Type of CPU Pinning policy.",
+            "description": "Type of CPU pinning policy.",
             "type": "string",
             "enum": [
               "shared",
               "dedicated"
             ]
+        },
+        "cpu_thread_policy": {
+            "title": "CPU Thread Pinning Policy.",
+            "description": "Type of CPU thread pinning policy.",
+            "type": "string",
+            "enum": [
+                "isolate",
+                "prefer",
+                "require"
+            ]
         }
     }
 }

releasenotes/notes/add-cpu-thread-pinning-metadata-09b1866b875c4647.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - Added additional metadata for CPU thread pinning policies to
+    'compute-cpu-pinning.json'. Use the ``glance_manage`` tool to upgrade.