From 34f06005fa433a38ee9f91ae1707204242f6f86c Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 2 Sep 2010 11:18:27 +0200
Subject: [PATCH] Disable the RAPI CA checks in watcher
Since the RAPI certificate is not necessarily self-signed, and we
currently don't have any configuration variable for the real CA file, we
disable for now the CA checks. This fixes the 'restart RAPI every 5
minutes' problem with non-self-signed certs.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
daemons/ganeti-watcher | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemons/ganeti-watcher b/daemons/ganeti-watcher
index 1a57d3bd8..6eb4446c4 100755
--- a/daemons/ganeti-watcher
+++ b/daemons/ganeti-watcher
@@ -1,7 +1,7 @@
#!/usr/bin/python
#
-# Copyright (C) 2006, 2007, 2008 Google Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 2010 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -641,7 +641,7 @@ def IsRapiResponding(hostname):
@return: Whether RAPI is working properly
"""
- curl_config = rapi.client.GenericCurlConfig(cafile=constants.RAPI_CERT_FILE)
+ curl_config = rapi.client.GenericCurlConfig()
rapi_client = rapi.client.GanetiRapiClient(hostname,
curl_config_fn=curl_config)
try:
--
GitLab