gnt-cluster verify: consider shared file storage

[ganeti-local] / qa / qa-sample.json

diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index 660989c..8ec6614 100644 (file)
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -27,7 +27,16 @@
   "vg-name": "xenvg",
   "# Cluster-level value of the exclusive-storage flag": null,
   "exclusive-storage": null,
-  "enabled-storage-types": "lvm-vg",
+
+  "# Only enable disk templates that the QA machines can actually use.": null,
+  "enabled-disk-templates": [
+    "plain",
+    "drbd",
+    "diskless"
+  ],
+
+  "# Default file storage dir (used also for shared storage)": null,
+  "default-file-storage-dir": "/srv/ganeti/file-storage",
 
   "# Additional arguments for initializing cluster": null,
   "cluster-init-args": [],
@@ -62,9 +71,23 @@
   "#ispec_nic_count_min": null,
   "#ispec_nic_count_std": null,
 
-  "# Lists of disk sizes": null,
-  "disk": ["1G", "512M"],
-  "disk-growth": ["2G", "768M"],
+  "# Lists of disks": null,
+  "disks": [
+    {
+      "size": "1G",
+      "spindles": 2,
+      "name": "disk0",
+      "growth": "2G",
+      "spindles-growth": 1
+    },
+    {
+      "size": "512M",
+      "spindles": 1,
+      "name": "disk1",
+      "growth": "768M",
+      "spindles-growth": 0
+    }
+  ],
 
   "# Script to check instance status": null,
   "instance-check": null,
@@ -163,15 +186,19 @@
     "node-modify": true,
     "node-oob": true,
 
-    "# This test needs at least three nodes": null,
+    "# These tests need at least three nodes": null,
     "node-evacuate": false,
+    "node-migrate": false,
 
     "# This test needs at least two nodes": null,
     "node-failover": false,
 
     "instance-add-plain-disk": true,
+    "instance-add-file": true,
+    "instance-add-shared-file": true,
     "instance-add-drbd-disk": true,
     "instance-add-diskless": true,
+    "instance-add-restricted-by-disktemplates": true,
     "instance-convert-disk": true,
     "instance-plain-rapi-common-tests": true,
     "instance-remove-drbd-offline": true,
@@ -184,10 +211,13 @@
     "instance-list": true,
     "instance-migrate": true,
     "instance-modify": true,
+    "instance-modify-primary": true,
+    "instance-modify-disks": false,
     "instance-reboot": true,
     "instance-reinstall": true,
     "instance-rename": true,
     "instance-shutdown": true,
+    "instance-device-names": true,
 
     "job-list": true,
 
@@ -208,7 +238,9 @@
 
     "# Run instance tests with different cluster configurations": null,
     "default-instance-tests": true,
-    "exclusive-storage-instance-tests": false
+    "exclusive-storage-instance-tests": false,
+
+    "mon-collector": true
   },
 
   "options": {