Move the pseudo-secret generation to utils.py

[ganeti-local] / qa / qa_config.py

diff --git a/qa/qa_config.py b/qa/qa_config.py
index 54bd562..13d857f 100644 (file)
--- a/qa/qa_config.py
+++ b/qa/qa_config.py
@@ -24,7 +24,7 @@
 """
 
 
-import yaml
+import simplejson
 
 import qa_error
 
@@ -41,7 +41,7 @@ def Load(path):
 
   f = open(path, 'r')
   try:
-    cfg = yaml.load(f.read())
+    cfg = simplejson.load(f)
   finally:
     f.close()
 
@@ -54,11 +54,6 @@ def Validate():
   if len(cfg['instances']) < 1:
     raise qa_error.Error("Need at least one instance")
 
-  if (TestEnabled('instance-add-remote-raid-disk') and
-      TestEnabled('instance-add-drbd-disk')):
-    raise qa_error.Error('Tests for disk templates remote_raid1 and drbd'
-                         ' cannot be enabled at the same time.')
-
 
 def get(name, default=None):
   return cfg.get(name, default)