From 28becd1aadd3b6f3ed1c656f79470a2a988e2c72 Mon Sep 17 00:00:00 2001
From: Travis Tripp <travis.tripp@hpe.com>
Date: Thu, 21 Jan 2016 17:29:21 -0700
Subject: [PATCH] Add properties_target to Instance SW metadefs

There are several metadata definitions for software that are
associated with Nova instances (OS::Nova::Instance) which should
have their properties target set to "metadata".

The ability to add metadata to an instance leveraging these
definitions at launch time was recently added to horizon. In
a follow up discussion, somebody asked about using the metadata
definitions to also choose nova scheduler hints at launch time,
without confusing the two intended purposes of the metadata.
This raised our awareness that we don't have properties_target
set to "metadata" (rather than "scheduler hints") for
OS::Nova::Instance on the software metadata definition files.

This patch adds "properties_target": "metadata" to those files.

Change-Id: I247226ad78762d1d2add3bb39b1e780b93f36370
Closes-Bug: 1536849
---
 etc/metadefs/software-databases.json  | 3 ++-
 etc/metadefs/software-runtimes.json   | 5 +++--
 etc/metadefs/software-webservers.json | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/etc/metadefs/software-databases.json b/etc/metadefs/software-databases.json
index 213c1bdf46..fcbf5d9d73 100644
--- a/etc/metadefs/software-databases.json
+++ b/etc/metadefs/software-databases.json
@@ -13,7 +13,8 @@
             "properties_target": "image"
         },
         {
-            "name": "OS::Nova::Instance"
+            "name": "OS::Nova::Instance",
+            "properties_target": "metadata"
         },
         {
             "name": "OS::Trove::Instance"
diff --git a/etc/metadefs/software-runtimes.json b/etc/metadefs/software-runtimes.json
index 67c5235334..244ae3e41b 100644
--- a/etc/metadefs/software-runtimes.json
+++ b/etc/metadefs/software-runtimes.json
@@ -13,7 +13,8 @@
             "properties_target": "image"
         },
         {
-            "name": "OS::Nova::Instance"
+            "name": "OS::Nova::Instance",
+            "properties_target": "metadata"
         }
     ],
     "objects": [
@@ -73,4 +74,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/etc/metadefs/software-webservers.json b/etc/metadefs/software-webservers.json
index ac0cc84825..b626c74b20 100644
--- a/etc/metadefs/software-webservers.json
+++ b/etc/metadefs/software-webservers.json
@@ -13,7 +13,8 @@
             "properties_target": "image"
         },
         {
-            "name": "OS::Nova::Instance"
+            "name": "OS::Nova::Instance",
+            "properties_target": "metadata"
         }
     ],
     "objects": [
@@ -99,4 +100,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}