From 411418b04449f53afcbd103efcc0231fc825b0a7 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <sfinucan@redhat.com>
Date: Thu, 11 Aug 2016 17:32:58 +0100
Subject: [PATCH] Add CPU thread pinning to metadata defs

CPU pinning policy is defined, but CPU thread pinning policy is not.
Resolve this.

UpgradeImpact
Change-Id: Ie3027a9ee92ac272b6c9a07926aa529d72187d00
Closes-bug: #1612341
---
 etc/metadefs/compute-cpu-pinning.json              | 14 ++++++++++++--
 ...u-thread-pinning-metadata-09b1866b875c4647.yaml |  4 ++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/add-cpu-thread-pinning-metadata-09b1866b875c4647.yaml

diff --git a/etc/metadefs/compute-cpu-pinning.json b/etc/metadefs/compute-cpu-pinning.json
index b3c4d223ec..66ff825226 100644
--- a/etc/metadefs/compute-cpu-pinning.json
+++ b/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"
+            ]
         }
     }
 }
diff --git a/releasenotes/notes/add-cpu-thread-pinning-metadata-09b1866b875c4647.yaml b/releasenotes/notes/add-cpu-thread-pinning-metadata-09b1866b875c4647.yaml
new file mode 100644
index 0000000000..583185b11e
--- /dev/null
+++ b/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.