X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/f346a7d990b7b036eefbd523391271b26a2acec1..7ec2f76bf6519ad4a49f6049e5b49da71f4c2d4c:/qa/qa-sample.json

diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index 0769d08..9b96484 100644
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -1,6 +1,14 @@
 {
+  "# Note:": null,
+  "# This file is stored in the JSON format and does not support": null,
+  "# comments. As a work-around, comments are keys starting with a hash": null,
+  "# sign (#).": null,
+
   "name": "xen-test",
+
+  "# Name used for renaming cluster": null,
   "rename": "xen-test-rename",
+
   "enabled-hypervisors": "xen-pvm",
   "# Dict of hypervisor name and parameters (like on the cmd line)": null,
   "hypervisor-parameters": {},
@@ -12,6 +20,15 @@
   "os-hvp": {},
   "primary_ip_version": 4,
 
+  "# Network interface for master role": null,
+  "#master-netdev": "xen-br0",
+
+  "# Default network interface parameters": null,
+  "#default-nicparams": {
+    "mode": "bridged",
+    "link": "xen-br0",
+  },
+
   "os": "debian-etch",
   "maxmem": "1024M",
   "minmem": "512M",
@@ -95,6 +112,9 @@
     "cluster-redist-conf": true,
     "cluster-repair-disk-sizes": true,
 
+    "haskell-confd": true,
+    "htools": true,
+
     "group-list": true,
     "group-rwops": true,
 
@@ -116,6 +136,7 @@
     "instance-add-drbd-disk": true,
     "instance-convert-disk": true,
     "instance-plain-rapi-common-tests": true,
+    "instance-remove-drbd-offline": true,
 
     "instance-export": true,
     "instance-failover": true,
@@ -140,8 +161,9 @@
     "# on whether they support the `gnt-instance console' command.": null,
     "instance-console": false,
 
-    "# Disabled by default because it takes rather long": null,
+    "# Disabled by default because they take rather long": null,
     "instance-replace-disks": false,
+    "instance-recreate-disks": false,
 
     "# Whether to test the tools/move-instance utility": null,
     "inter-cluster-instance-move": false,
@@ -159,7 +181,8 @@
     "burnin-check-instances": false,
     "burnin-rename": "xen-test-rename",
     "burnin-reboot": true,
-    "reboot-types": ["soft", "hard", "full"]
+    "reboot-types": ["soft", "hard", "full"],
+    "use-iallocators": false
   },
 
   "# vim: set syntax=javascript :": null