From bcf0450deb8898b7f8c070f00875eb80228135b4 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 27 Jul 2011 10:46:52 +0200
Subject: [PATCH] Rename watcher's constant for instance status file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
βupfileβ is a bad name.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/constants.py | 2 +-
lib/watcher/__init__.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/constants.py b/lib/constants.py
index 140ac521c..ea8f408fe 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -138,7 +138,7 @@ CONFD_HMAC_KEY = DATA_DIR + "/hmac.key"
CLUSTER_DOMAIN_SECRET_FILE = DATA_DIR + "/cluster-domain-secret"
WATCHER_STATEFILE = DATA_DIR + "/watcher.data"
WATCHER_PAUSEFILE = DATA_DIR + "/watcher.pause"
-INSTANCE_UPFILE = RUN_GANETI_DIR + "/instance-status"
+INSTANCE_STATUS_FILE = RUN_GANETI_DIR + "/instance-status"
SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts"
RAPI_USERS_FILE = DATA_DIR + "/rapi/users"
QUEUE_DIR = DATA_DIR + "/queue"
diff --git a/lib/watcher/__init__.py b/lib/watcher/__init__.py
index 9f6b2c952..f931388d3 100644
--- a/lib/watcher/__init__.py
+++ b/lib/watcher/__init__.py
@@ -318,9 +318,9 @@ def GetClusterData():
instances = {}
- # write the upfile
+ # write the instance status file
up_data = "".join(["%s %s\n" % (fields[0], fields[1]) for fields in result])
- utils.WriteFile(file_name=constants.INSTANCE_UPFILE, data=up_data)
+ utils.WriteFile(file_name=constants.INSTANCE_STATUS_FILE, data=up_data)
for fields in result:
(name, status, autostart, snodes) = fields
--
GitLab