Commit df224efd authored by Dimitris Aragiorgis's avatar Dimitris Aragiorgis Committed by Christos Stavrakakis
Browse files

gtools: Support Ganeti 2.10 too



Since Ganeti 2.10, the private ganeti module is installed and linked
under /etc/ganeti/share. If this path is found, include this path
in eventd.py before importing any ganeti related modules. Otherwise
import ganeti from /usr/share/ganeti.
Signed-off-by: default avatarDimitris Aragiorgis <dimara@grnet.gr>
parent 63aa664d
...@@ -41,6 +41,9 @@ A daemon to monitor the Ganeti job queue and publish job progress ...@@ -41,6 +41,9 @@ A daemon to monitor the Ganeti job queue and publish job progress
and Ganeti VM state notifications to the ganeti exchange and Ganeti VM state notifications to the ganeti exchange
""" """
OLD_GANETI_PATH = "/usr/share/ganeti"
NEW_GANETI_PATH = "/etc/ganeti/share"
import sys import sys
import os import os
path = os.path.normpath(os.path.join(os.getcwd(), '..')) path = os.path.normpath(os.path.join(os.getcwd(), '..'))
...@@ -49,7 +52,22 @@ sys.path.append(path) ...@@ -49,7 +52,22 @@ sys.path.append(path)
# a private module under '/usr/share/ganeti'. Add this directory to path # a private module under '/usr/share/ganeti'. Add this directory to path
# in order to be able to import ganeti. Also, add it to the start of path # in order to be able to import ganeti. Also, add it to the start of path
# to allow conflicts with Ganeti RAPI client. # to allow conflicts with Ganeti RAPI client.
sys.path.insert(0, "/usr/share/ganeti") # Since Ganeti 2.10 the python module is installed (linked) under
# /etc/ganeti/share
# Favor latest ganeti if found
if os.path.exists(NEW_GANETI_PATH):
GANETI_PATH = NEW_GANETI_PATH
else:
GANETI_PATH = OLD_GANETI_PATH
sys.path.insert(0, GANETI_PATH)
try:
import ganeti
except ImportError:
raise Exception("Cannot import ganeti module. Please check if installed"
" under %s for 2.8 or under %s for 2.10 or later." %
(OLD_GANETI_PATH, NEW_GANETI_PATH))
import json import json
import logging import logging
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment