evilham/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

restructure to _path and do not make context dependent on env

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-07 15:03:26 +02:00
commit e1f0d60e8b
2 changed files with 46 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/cdist/config_install.py
View file

@ -54,11 +54,14 @@ class ConfigInstall:
def cleanup(self): def cleanup(self):
self.path.cleanup() self.path.cleanup()
def __init_env(self):
"""Setup environment"""
def run_initial_manifest(self): def run_initial_manifest(self):
"""Run the initial manifest""" """Run the initial manifest"""
log.info("Running initial manifest %s", self.path.initial_manifest) log.info("Running initial manifest %s", self.context.initial_manifest)
env = { "__manifest" : self.path.manifest_dir } env = { "__manifest" : self.context.manifest_dir }
self.run_manifest(self.path.initial_manifest, extra_env=env) self.run_manifest(self.context.initial_manifest, extra_env=env)
def run_type_manifest(self, cdist_object): def run_type_manifest(self, cdist_object):
"""Run manifest for a specific object""" """Run manifest for a specific object"""

75
lib/cdist/context.py
View file

@ -31,58 +31,63 @@ log = logging.getLogger(__name__)
import cdist.exec import cdist.exec
class Context: class Context:
"""Storing context dependent information""" """Storing context information"""
def __init__(self, target_host, initial_manifest=False, base_dir=False, def __init__(self,
target_host,
initial_manifest=False,
base_path=False,
out_path=False,
debug=False): debug=False):
self.target_host = target_host self.target_host = target_host
# Base and Temp Base # Base and Temp Base
if base_dir: if base_path:
self.base_dir = base_dir self.base_path = base_path
elif "__cdist_base_dir" in os.environ:
self.base_dir = os.environ['__cdist_base_dir']
else: else:
self.base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir)) self.base_path =
os.path.abspath(
os.path.join(os.path.dirname(__file__),
os.pardir,
os.pardir))
# Input directories # Input directories
self.cache_dir = os.path.join(self.base_dir, "cache", target_host) self.cache_path = os.path.join(self.base_path, "cache", target_host)
self.conf_dir = os.path.join(self.base_dir, "conf") self.conf_path = os.path.join(self.base_path, "conf")
self.manifest_dir = os.path.join(self.conf_dir, "manifest")
# Probably unused paths self.global_explorer_path = os.path.join(self.conf_path, "explorer")
# self.global_explorer_dir = os.path.join(self.conf_dir, "explorer") self.manifest_path = os.path.join(self.conf_path, "manifest")
# self.lib_dir = os.path.join(self.base_dir, "lib") self.type_base_path = os.path.join(self.conf_path, "type")
# self.type_base_dir = os.path.join(self.conf_dir, "type") self.lib_path = os.path.join(self.base_path, "lib")
# Mostly static, but can be overwritten on user demand # Mostly static, but can be overwritten on user demand
if initial_manifest: if initial_manifest:
self.initial_manifest = initial_manifest self.initial_manifest = initial_manifest
else: else:
self.initial_manifest = os.path.join(self.manifest_dir, "init") self.initial_manifest = os.path.join(self.manifest_path, "init")
# Output directories # Output directories
if "__cdist_out_dir" in os.environ: if out_path:
self.out_dir = os.environ['__cdist_out_dir'] self.out_path = out_path:
else: else:
self.out_dir = os.path.join(tempfile.mkdtemp(), "out") self.out_path = os.path.join(tempfile.mkdtemp(), "out")
self.global_explorer_out_dir = os.path.join(self.out_dir, "explorer") self.global_explorer_out_path = os.path.join(self.out_path, "explorer")
self.object_base_dir = os.path.join(self.out_dir, "object") self.object_base_path = os.path.join(self.out_path, "object")
self.bin_dir = os.path.join(self.out_dir, "bin") self.bin_path = os.path.join(self.out_path, "bin")
# Remote directories # Remote directories
if "__cdist_remote_base_dir" in os.environ: if "__cdist_remote_base_path" in os.environ:
self.remote_base_dir = os.environ['__cdist_remote_base_dir'] self.remote_base_path = os.environ['__cdist_remote_base_path']
else: else:
self.remote_base_dir = "/var/lib/cdist" self.remote_base_path = "/var/lib/cdist"
self.remote_conf_dir = os.path.join(self.remote_base_dir, "conf") self.remote_conf_path = os.path.join(self.remote_base_path, "conf")
self.remote_object_dir = os.path.join(self.remote_base_dir, "object") self.remote_object_dir = os.path.join(self.remote_base_path, "object")
self.remote_type_dir = os.path.join(self.remote_conf_dir, "type") self.remote_type_dir = os.path.join(self.remote_conf_path, "type")
self.remote_global_explorer_dir = os.path.join(self.remote_conf_dir, "explorer") self.remote_global_explorer_dir = os.path.join(self.remote_conf_path, "explorer")
# Create directories # Create directories
self.__init_out_dirs() self.__init_out_dirs()
@ -95,23 +100,23 @@ class Context:
# "other globals referenced by the __del__() method may already have been deleted # "other globals referenced by the __del__() method may already have been deleted
# or in the process of being torn down (e.g. the import machinery shutting down)" # or in the process of being torn down (e.g. the import machinery shutting down)"
# #
log.debug("Saving" + self.base_dir + "to " + self.cache_dir) log.debug("Saving" + self.base_path + "to " + self.cache_path)
# Remove previous cache # Remove previous cache
if os.path.exists(self.cache_dir): if os.path.exists(self.cache_path):
shutil.rmtree(self.cache_dir) shutil.rmtree(self.cache_path)
shutil.move(self.base_dir, self.cache_dir) shutil.move(self.base_path, self.cache_path)
def __init_env(self): def __init_env(self):
"""Setup environment""" """Setup environment"""
os.environ['__cdist_out_dir'] = self.out_dir os.environ['__cdist_out_dir'] = self.out_dir
os.environ['__cdist_base_dir'] = self.base_dir os.environ['__cdist_base_path'] = self.base_path
def __init_out_dirs(self): def __init_out_dirs(self):
"""Initialise output directory structure""" """Initialise output directory structure"""
# Create base dir, if user supplied and not existing # Create base dir, if user supplied and not existing
if not os.path.isdir(self.base_dir): if not os.path.isdir(self.base_path):
os.mkdir(self.base_dir) os.mkdir(self.base_path)
os.mkdir(self.out_dir) os.mkdir(self.out_dir)
os.mkdir(self.global_explorer_out_dir) os.mkdir(self.global_explorer_out_dir)