From d3100055bb86121158ad0cff98dfb0a5e3b4f066 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Tue, 23 Feb 2010 17:10:37 +0100
Subject: [PATCH] Add constant with cluster X509 certificates
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/cmdlib.py | 3 +--
lib/constants.py | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 2b26f1b6b..3179e9746 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1336,8 +1336,7 @@ class LUVerifyCluster(LogicalUnit):
master_files = [constants.CLUSTER_CONF_FILE]
file_names = ssconf.SimpleStore().GetFileList()
- file_names.append(constants.SSL_CERT_FILE)
- file_names.append(constants.RAPI_CERT_FILE)
+ file_names.extend(constants.ALL_CERT_FILES)
file_names.extend(master_files)
local_checksums = utils.FingerprintFiles(file_names)
diff --git a/lib/constants.py b/lib/constants.py
index 2789beac5..2977c6470 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -114,6 +114,8 @@ SYSCONFDIR = _autoconf.SYSCONFDIR
TOOLSDIR = _autoconf.TOOLSDIR
CONF_DIR = SYSCONFDIR + "/ganeti"
+ALL_CERT_FILES = frozenset([SSL_CERT_FILE, RAPI_CERT_FILE])
+
MASTER_SOCKET = SOCKET_DIR + "/ganeti-master"
NODED = "ganeti-noded"
--
GitLab