summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyril Roelandt <cyril@redhat.com>2020-07-10 02:55:11 +0200
committerCyril Roelandt <cyril@redhat.com>2020-08-31 18:55:55 +0200
commit2877365040f986763021eb161247896480a75d9e (patch)
tree68433a91544343e08ad4a0de3bad8db1c8c66a2e
parentfcba03989feed85a3301e53b252f766eabeeba3c (diff)
downloadglance-2877365040f986763021eb161247896480a75d9e.tar.gz
Fix metadefs for compute-watchdog
Change-Id: Idf9be5afea5d034b9679ad451306a8f2d365aa51 Closes-Bug: #1887099 (cherry picked from commit 24c281230e42a1592b563af0ae50518ecb8bb10e)
-rw-r--r--etc/metadefs/compute-watchdog.json9
1 files changed, 6 insertions, 3 deletions
diff --git a/etc/metadefs/compute-watchdog.json b/etc/metadefs/compute-watchdog.json
index a8e9e43ab..5a6966341 100644
--- a/etc/metadefs/compute-watchdog.json
+++ b/etc/metadefs/compute-watchdog.json
@@ -6,18 +6,21 @@
"protected": true,
"resource_type_associations": [
{
- "name": "OS::Glance::Image"
+ "name": "OS::Glance::Image",
+ "prefix": "hw_"
},
{
"name": "OS::Cinder::Volume",
+ "prefix": "hw_",
"properties_target": "image"
},
{
- "name": "OS::Nova::Flavor"
+ "name": "OS::Nova::Flavor",
+ "prefix": "hw:"
}
],
"properties": {
- "hw_watchdog_action": {
+ "watchdog_action": {
"title": "Watchdog Action",
"description": "For the libvirt driver, you can enable and set the behavior of a virtual hardware watchdog device for each flavor. Watchdog devices keep an eye on the guest server, and carry out the configured action, if the server hangs. The watchdog uses the i6300esb device (emulating a PCI Intel 6300ESB). If hw_watchdog_action is not specified, the watchdog is disabled. Watchdog behavior set using a specific image's properties will override behavior set using flavors.",
"type": "string",