From 173dbf057380fc977b9439b8c64b38c6bb741310 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 29 Jul 2011 15:14:36 +0200
Subject: [PATCH] Remove WATCHER_STATEFILE constant
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/constants.py | 1 -
qa/qa_daemon.py | 1 -
2 files changed, 2 deletions(-)
diff --git a/lib/constants.py b/lib/constants.py
index a58f797d6..0edd31722 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -136,7 +136,6 @@ NODED_CERT_FILE = DATA_DIR + "/server.pem"
RAPI_CERT_FILE = DATA_DIR + "/rapi.pem"
CONFD_HMAC_KEY = DATA_DIR + "/hmac.key"
CLUSTER_DOMAIN_SECRET_FILE = DATA_DIR + "/cluster-domain-secret"
-WATCHER_STATEFILE = DATA_DIR + "/watcher.data"
INSTANCE_STATUS_FILE = RUN_GANETI_DIR + "/instance-status"
SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts"
RAPI_USERS_FILE = DATA_DIR + "/rapi/users"
diff --git a/qa/qa_daemon.py b/qa/qa_daemon.py
index 9a043208f..6b0ce9328 100644
--- a/qa/qa_daemon.py
+++ b/qa/qa_daemon.py
@@ -65,7 +65,6 @@ def _ResetWatcherDaemon():
"""Removes the watcher daemon's state file.
"""
- AssertCommand(["rm", "-f", constants.WATCHER_STATEFILE])
AssertCommand([
"bash", "-c",
"rm -vf %s" % (constants.WATCHER_GROUP_STATE_FILE % "*-*-*-*")
--
GitLab