Modify Disk.GetNodes() to support LD_FILE

[ganeti-local] / qa / qa_config.py

diff --git a/qa/qa_config.py b/qa/qa_config.py
index a180b32..d7a6ed3 100644 (file)
--- a/qa/qa_config.py
+++ b/qa/qa_config.py
@@ -1,3 +1,6 @@
+#
+#
+
 # Copyright (C) 2007 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -51,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)