From 33c025de401b184df3c50ed56c2228b30c2f65f7 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 12 Apr 2012 10:23:23 +0200 Subject: [PATCH] look for the xml template under 2 names so the lxc-reference packaging might still be used for now --- sliver_lxc.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/sliver_lxc.py b/sliver_lxc.py index 32f73be..1b038d5 100644 --- a/sliver_lxc.py +++ b/sliver_lxc.py @@ -5,7 +5,7 @@ import accounts import logger import subprocess -import os +import os, os.path import libvirt import sys from string import Template @@ -90,13 +90,27 @@ class Sliver_LXC(lv.Sliver_Libvirt): xid = bwlimit.get_xid(name) # Template for libvirt sliver configuration - template_filename = Sliver_LXC.REF_IMG_BASE_DIR + '/lxc_template.xml' +# template_filename = Sliver_LXC.REF_IMG_BASE_DIR + '/lxc_template.xml' + # for compat with lxc-reference package, hopefully temporary + template_filename_lxcreference = os.path.join(Sliver_LXC.REF_IMG_BASE_DIR,'config_template.xml') + template_filename_sliceimage = os.path.join(Sliver_LXC.REF_IMG_BASE_DIR,'lxc_template.xml') + if os.path.isfile (template_filename_lxcreference): + logger.log("WARNING: using compat template %s"%template_filename_lxcreference) + template_filename=template_filename_lxcreference + elif os.path.isfile (template_filename_sliceimage): + logger.log("WARNING: using compat template %s"%template_filename_sliceimage) + template_filename=template_filename_sliceimage + else: + logger.log("Cannot find XML template") + logger.log("neither %s"%template_filename_lxcreference) + logger.log("nor %s"%template_filename_sliceimage) + return try: with open(template_filename) as f: template = Template(f.read()) xml = template.substitute(name=name, xid=xid) except IOError: - logger.log('Cannot find XML template file %s'%template_filename) + logger.log('Failed to parse or use XML template file %s'%template_filename) return # Lookup for the sliver before actually -- 2.43.0