From c5cd9637c7dcb2333f6d77eed838376bbde87bfc Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 4 Feb 2013 16:06:26 +0100
Subject: [PATCH] qa_config: Remove useless "options" variable
It is only used in one place and not necessary.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
qa/ganeti-qa.py | 4 ++--
qa/qa_config.py | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 7d4262cba..1563164fd 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -655,14 +655,14 @@ def main():
parser.add_option("--yes-do-it", dest="yes_do_it",
action="store_true",
help="Really execute the tests")
- (qa_config.options, args) = parser.parse_args()
+ (opts, args) = parser.parse_args()
if len(args) == 1:
(config_file, ) = args
else:
parser.error("Wrong number of arguments.")
- if not qa_config.options.yes_do_it:
+ if not opts.yes_do_it:
print ("Executing this script irreversibly destroys any Ganeti\n"
"configuration on all nodes involved. If you really want\n"
"to start testing, supply the --yes-do-it option.")
diff --git a/qa/qa_config.py b/qa/qa_config.py
index 6c4e3f53f..cf697509f 100644
--- a/qa/qa_config.py
+++ b/qa/qa_config.py
@@ -40,7 +40,6 @@ _EXCLUSIVE_STORAGE_KEY = "_exclusive_storage"
cfg = {}
-options = None
def Load(path):
--
GitLab