forked from ungleich-public/cdist
Merge remote-tracking branch 'telmich/master' into oo-restructure
This commit is contained in:
Steven Armstrong
commit
b4fc05ba09
24 changed files with 491 additions and 570 deletions
|
|
@ -33,4 +33,4 @@ class MissingEnvironmentVariableError(Error):
|
|||
self.name = name
|
||||
|
||||
def __str__(self):
|
||||
return 'Missing required environment variable: {0.name}'.format(o)
|
||||
return 'Missing required environment variable: ' + str(self.name)
|
||||
|
|
|
|||
|
|
@ -22,10 +22,13 @@
|
|||
|
||||
import datetime
|
||||
import logging
|
||||
log = logging.getLogger(__name__)
|
||||
import os
|
||||
import sys
|
||||
|
||||
import cdist.config_install
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
class Config(cdist.config_install.ConfigInstall):
|
||||
pass
|
||||
|
||||
|
|
@ -35,6 +38,9 @@ def config(args):
|
|||
|
||||
time_start = datetime.datetime.now()
|
||||
|
||||
os.environ['__remote_exec'] = "ssh -o User=root -q"
|
||||
os.environ['__remote_copy'] = "scp -o User=root -q"
|
||||
|
||||
for host in args.host:
|
||||
c = Config(host, initial_manifest=args.manifest, home=args.cdist_home, debug=args.debug)
|
||||
if args.parallel:
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
#
|
||||
#
|
||||
|
||||
import datetime
|
||||
import logging
|
||||
import os
|
||||
import stat
|
||||
|
|
@ -29,278 +28,253 @@ import sys
|
|||
import cdist.emulator
|
||||
import cdist.path
|
||||
|
||||
import cdist.core
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
CODE_HEADER = "#!/bin/sh -e\n"
|
||||
CODE_HEADER = "#!/bin/sh -e\n"
|
||||
|
||||
class ConfigInstall:
|
||||
"""Class to hold install and config methods"""
|
||||
"""Cdist main class to hold arbitrary data"""
|
||||
|
||||
def __init__(self, target_host,
|
||||
initial_manifest=False,
|
||||
remote_user="root",
|
||||
home=None,
|
||||
exec_path=sys.argv[0],
|
||||
debug=False):
|
||||
def __init__(self, target_host,
|
||||
initial_manifest=False,
|
||||
home=None,
|
||||
exec_path=sys.argv[0],
|
||||
debug=False):
|
||||
|
||||
self.target_host = target_host
|
||||
self.debug = debug
|
||||
self.remote_user = remote_user
|
||||
self.exec_path = exec_path
|
||||
self.target_host = target_host
|
||||
os.environ['target_host'] = target_host
|
||||
|
||||
# FIXME: broken - construct elsewhere!
|
||||
self.remote_prefix = ["ssh", self.remote_user + "@" + self.target_host]
|
||||
self.debug = debug
|
||||
self.exec_path = exec_path
|
||||
|
||||
self.path = cdist.path.Path(self.target_host,
|
||||
initial_manifest=initial_manifest,
|
||||
remote_user=self.remote_user,
|
||||
remote_prefix=self.remote_prefix,
|
||||
base_dir=home,
|
||||
debug=debug)
|
||||
|
||||
self.objects_prepared = []
|
||||
self.path = cdist.path.Path(self.target_host,
|
||||
initial_manifest=initial_manifest,
|
||||
base_dir=home,
|
||||
debug=debug)
|
||||
|
||||
def cleanup(self):
|
||||
self.path.cleanup()
|
||||
|
||||
def cleanup(self):
|
||||
self.path.cleanup()
|
||||
def run_global_explorers(self):
|
||||
"""Run global explorers"""
|
||||
log.info("Running global explorers")
|
||||
explorers = self.path.list_global_explorers()
|
||||
if(len(explorers) == 0):
|
||||
raise cdist.Error("No explorers found in " + self.path.global_explorer_dir)
|
||||
|
||||
def run_global_explorers(self):
|
||||
"""Run global explorers"""
|
||||
log.info("Running global explorers")
|
||||
explorers = self.path.list_global_explorers()
|
||||
if(len(explorers) == 0):
|
||||
raise CdistError("No explorers found in", self.path.global_explorer_dir)
|
||||
self.path.transfer_global_explorers()
|
||||
for explorer in explorers:
|
||||
output = self.path.global_explorer_output_path(explorer)
|
||||
output_fd = open(output, mode='w')
|
||||
cmd = []
|
||||
cmd.append("__explorer=" + cdist.path.REMOTE_GLOBAL_EXPLORER_DIR)
|
||||
cmd.append(self.path.remote_global_explorer_path(explorer))
|
||||
|
||||
self.path.transfer_global_explorers()
|
||||
for explorer in explorers:
|
||||
output = self.path.global_explorer_output_path(explorer)
|
||||
output_fd = open(output, mode='w')
|
||||
cmd = []
|
||||
cmd.append("__explorer=" + cdist.path.REMOTE_GLOBAL_EXPLORER_DIR)
|
||||
cmd.append(self.path.remote_global_explorer_path(explorer))
|
||||
cdist.exec.run_or_fail(cmd, stdout=output_fd, remote_prefix=True)
|
||||
output_fd.close()
|
||||
|
||||
cdist.exec.run_or_fail(cmd, stdout=output_fd, remote_prefix=self.remote_prefix)
|
||||
output_fd.close()
|
||||
def run_type_explorer(self, cdist_object):
|
||||
"""Run type specific explorers for objects"""
|
||||
|
||||
# FIXME: where to call this from?
|
||||
def run_type_explorer(self, cdist_object):
|
||||
"""Run type specific explorers for objects"""
|
||||
type = cdist_object.type
|
||||
self.path.transfer_type_explorers(type)
|
||||
|
||||
type = self.path.get_type_from_object(cdist_object)
|
||||
self.path.transfer_type_explorers(type)
|
||||
cmd = []
|
||||
cmd.append("__explorer=" + cdist.path.REMOTE_GLOBAL_EXPLORER_DIR)
|
||||
cmd.append("__type_explorer=" + self.path.remote_type_explorer_dir(type))
|
||||
cmd.append("__object=" + self.path.remote_object_dir(cdist_object))
|
||||
cmd.append("__object_id=" + self.path.get_object_id_from_object(cdist_object))
|
||||
cmd.append("__object_fq=" + cdist_object)
|
||||
|
||||
cmd = []
|
||||
cmd.append("__explorer=" + cdist.path.REMOTE_GLOBAL_EXPLORER_DIR)
|
||||
cmd.append("__type_explorer=" + self.path.remote_type_explorer_dir(type))
|
||||
cmd.append("__object=" + self.path.remote_object_dir(cdist_object))
|
||||
cmd.append("__object_id=" + self.path.get_object_id_from_object(cdist_object))
|
||||
cmd.append("__object_fq=" + cdist_object)
|
||||
# Need to transfer at least the parameters for objects to be useful
|
||||
self.path.transfer_object_parameter(cdist_object)
|
||||
|
||||
# Need to transfer at least the parameters for objects to be useful
|
||||
self.path.transfer_object_parameter(cdist_object)
|
||||
explorers = self.path.list_type_explorers(type)
|
||||
for explorer in explorers:
|
||||
remote_cmd = cmd + [os.path.join(self.path.remote_type_explorer_dir(type), explorer)]
|
||||
output = os.path.join(self.path.type_explorer_output_dir(cdist_object), explorer)
|
||||
output_fd = open(output, mode='w')
|
||||
log.debug("%s exploring %s using %s storing to %s",
|
||||
cdist_object, explorer, remote_cmd, output)
|
||||
|
||||
cdist.exec.run_or_fail(remote_cmd, stdout=output_fd, remote_prefix=True)
|
||||
output_fd.close()
|
||||
|
||||
# FIXME: Broken due to refactoring into type.py
|
||||
explorers = self.path.list_type_explorers(type)
|
||||
for explorer in explorers:
|
||||
remote_cmd = cmd + [os.path.join(self.path.remote_type_explorer_dir(type), explorer)]
|
||||
output = os.path.join(self.path.type_explorer_output_dir(cdist_object), explorer)
|
||||
output_fd = open(output, mode='w')
|
||||
log.debug("%s exploring %s using %s storing to %s",
|
||||
cdist_object, explorer, remote_cmd, output)
|
||||
|
||||
cdist.exec.run_or_fail(remote_cmd, stdout=output_fd, remote_prefix=self.remote_prefix)
|
||||
output_fd.close()
|
||||
def link_emulator(self):
|
||||
"""Link emulator to types"""
|
||||
cdist.emulator.link(self.exec_path,
|
||||
self.path.bin_dir, self.path.list_types())
|
||||
|
||||
def link_emulator(self):
|
||||
"""Link emulator to types"""
|
||||
cdist.emulator.link(self.exec_path,
|
||||
self.path.bin_dir, self.path.list_types())
|
||||
def run_initial_manifest(self):
|
||||
"""Run the initial manifest"""
|
||||
log.info("Running initial manifest %s", self.path.initial_manifest)
|
||||
env = { "__manifest" : self.path.manifest_dir }
|
||||
self.run_manifest(self.path.initial_manifest, extra_env=env)
|
||||
|
||||
def init_deploy(self):
|
||||
"""Ensure the base directories are cleaned up"""
|
||||
log.debug("Creating clean directory structure")
|
||||
def run_type_manifest(self, cdist_object):
|
||||
"""Run manifest for a specific object"""
|
||||
type = self.path.get_type_from_object(cdist_object)
|
||||
manifest = self.path.type_dir(type, "manifest")
|
||||
|
||||
log.debug("%s: Running %s", cdist_object, manifest)
|
||||
if os.path.exists(manifest):
|
||||
env = { "__object" : self.path.object_dir(cdist_object),
|
||||
"__object_id": self.path.get_object_id_from_object(cdist_object),
|
||||
"__object_fq": cdist_object,
|
||||
"__type": self.path.type_dir(type)
|
||||
}
|
||||
self.run_manifest(manifest, extra_env=env)
|
||||
|
||||
self.path.remove_remote_dir(cdist.path.REMOTE_BASE_DIR)
|
||||
self.path.remote_mkdir(cdist.path.REMOTE_BASE_DIR)
|
||||
self.link_emulator()
|
||||
def run_manifest(self, manifest, extra_env=None):
|
||||
"""Run a manifest"""
|
||||
log.debug("Running manifest %s, env=%s", manifest, extra_env)
|
||||
env = os.environ.copy()
|
||||
env['PATH'] = self.path.bin_dir + ":" + env['PATH']
|
||||
|
||||
def run_initial_manifest(self):
|
||||
"""Run the initial manifest"""
|
||||
log.info("Running initial manifest %s", self.path.initial_manifest)
|
||||
env = { "__manifest" : self.path.manifest_dir }
|
||||
self.run_manifest(self.path.initial_manifest, extra_env=env)
|
||||
# Information required in every manifest
|
||||
env['__target_host'] = self.target_host
|
||||
env['__global'] = self.path.out_dir
|
||||
|
||||
# Submit debug flag to manifest, can be used by emulator and types
|
||||
if self.debug:
|
||||
env['__debug'] = "yes"
|
||||
|
||||
def run_type_manifest(self, cdist_object):
|
||||
"""Run manifest for a specific object"""
|
||||
type = self.path.get_type_from_object(cdist_object)
|
||||
manifest = self.path.type_dir(type, "manifest")
|
||||
|
||||
log.debug("%s: Running %s", cdist_object, manifest)
|
||||
if os.path.exists(manifest):
|
||||
env = { "__object" : self.path.object_dir(cdist_object),
|
||||
"__object_id": self.path.get_object_id_from_object(cdist_object),
|
||||
"__object_fq": cdist_object,
|
||||
"__type": self.path.type_dir(type)
|
||||
}
|
||||
self.run_manifest(manifest, extra_env=env)
|
||||
# Required for recording source
|
||||
env['__cdist_manifest'] = manifest
|
||||
|
||||
def run_manifest(self, manifest, extra_env=None):
|
||||
"""Run a manifest"""
|
||||
log.debug("Running manifest %s, env=%s", manifest, extra_env)
|
||||
env = os.environ.copy()
|
||||
env['PATH'] = self.path.bin_dir + ":" + env['PATH']
|
||||
# Required to find types
|
||||
env['__cdist_type_base_dir'] = self.path.type_base_dir
|
||||
|
||||
# Information required in every manifest
|
||||
env['__target_host'] = self.target_host
|
||||
env['__global'] = self.path.out_dir
|
||||
|
||||
# Submit debug flag to manifest, can be used by emulator and types
|
||||
if self.debug:
|
||||
env['__debug'] = "yes"
|
||||
# Other environment stuff
|
||||
if extra_env:
|
||||
env.update(extra_env)
|
||||
|
||||
# Required for recording source
|
||||
env['__cdist_manifest'] = manifest
|
||||
cdist.exec.shell_run_or_debug_fail(manifest, [manifest], env=env)
|
||||
|
||||
# Required to find types
|
||||
env['__cdist_type_base_dir'] = self.path.type_base_dir
|
||||
def object_run(self, cdist_object, mode):
|
||||
"""Run gencode or code for an object"""
|
||||
log.debug("Running %s from %s", mode, cdist_object)
|
||||
|
||||
# Other environment stuff
|
||||
if extra_env:
|
||||
env.update(extra_env)
|
||||
# FIXME: replace with new object interface
|
||||
file=os.path.join(self.path.object_dir(cdist_object), "require")
|
||||
requirements = cdist.path.file_to_list(file)
|
||||
type = self.path.get_type_from_object(cdist_object)
|
||||
|
||||
for requirement in requirements:
|
||||
log.debug("Object %s requires %s", cdist_object, requirement)
|
||||
self.object_run(requirement, mode=mode)
|
||||
|
||||
cdist.exec.shell_run_or_debug_fail(manifest, [manifest], env=env)
|
||||
#
|
||||
# Setup env Variable:
|
||||
#
|
||||
env = os.environ.copy()
|
||||
env['__target_host'] = self.target_host
|
||||
env['__global'] = self.path.out_dir
|
||||
env["__object"] = self.path.object_dir(cdist_object)
|
||||
env["__object_id"] = self.path.get_object_id_from_object(cdist_object)
|
||||
env["__object_fq"] = cdist_object
|
||||
env["__type"] = self.path.type_dir(type)
|
||||
|
||||
def object_run(self, cdist_object, mode):
|
||||
"""Run gencode or code for an object"""
|
||||
log.debug("Running %s from %s", mode, cdist_object)
|
||||
file=os.path.join(self.path.object_dir(cdist_object), "require")
|
||||
requirements = cdist.path.file_to_list(file)
|
||||
type = self.path.get_type_from_object(cdist_object)
|
||||
|
||||
for requirement in requirements:
|
||||
log.debug("Object %s requires %s", cdist_object, requirement)
|
||||
self.object_run(requirement, mode=mode)
|
||||
if mode == "gencode":
|
||||
paths = [
|
||||
self.path.type_dir(type, "gencode-local"),
|
||||
self.path.type_dir(type, "gencode-remote")
|
||||
]
|
||||
for bin in paths:
|
||||
if os.path.isfile(bin):
|
||||
# omit "gen" from gencode and use it for output base
|
||||
outfile=os.path.join(self.path.object_dir(cdist_object),
|
||||
os.path.basename(bin)[3:])
|
||||
|
||||
#
|
||||
# Setup env Variable:
|
||||
#
|
||||
env = os.environ.copy()
|
||||
env['__target_host'] = self.target_host
|
||||
env['__global'] = self.path.out_dir
|
||||
env["__object"] = self.path.object_dir(cdist_object)
|
||||
env["__object_id"] = self.path.get_object_id_from_object(cdist_object)
|
||||
env["__object_fq"] = cdist_object
|
||||
env["__type"] = self.path.type_dir(type)
|
||||
outfile_fd = open(outfile, "w")
|
||||
|
||||
if mode == "gencode":
|
||||
paths = [
|
||||
self.path.type_dir(type, "gencode-local"),
|
||||
self.path.type_dir(type, "gencode-remote")
|
||||
]
|
||||
for bin in paths:
|
||||
if os.path.isfile(bin):
|
||||
# omit "gen" from gencode and use it for output base
|
||||
outfile=os.path.join(self.path.object_dir(cdist_object),
|
||||
os.path.basename(bin)[3:])
|
||||
# Need to flush to ensure our write is done before stdout write
|
||||
outfile_fd.write(CODE_HEADER)
|
||||
outfile_fd.flush()
|
||||
|
||||
outfile_fd = open(outfile, "w")
|
||||
cdist.exec.shell_run_or_debug_fail(bin, [bin], env=env, stdout=outfile_fd)
|
||||
outfile_fd.close()
|
||||
|
||||
# Need to flush to ensure our write is done before stdout write
|
||||
# FIXME: CODE_HEADER needed in our sh -e scenario?
|
||||
outfile_fd.write(CODE_HEADER)
|
||||
outfile_fd.flush()
|
||||
status = os.stat(outfile)
|
||||
|
||||
cdist.exec.shell_run_or_debug_fail(bin, [bin], env=env, stdout=outfile_fd)
|
||||
outfile_fd.close()
|
||||
# Remove output if empty, else make it executable
|
||||
if status.st_size == len(CODE_HEADER):
|
||||
os.unlink(outfile)
|
||||
else:
|
||||
# Add header and make executable - identically to 0o700
|
||||
os.chmod(outfile, stat.S_IXUSR | stat.S_IRUSR | stat.S_IWUSR)
|
||||
|
||||
status = os.stat(outfile)
|
||||
|
||||
# Remove output if empty, else make it executable
|
||||
if status.st_size == len(CODE_HEADER):
|
||||
os.unlink(outfile)
|
||||
else:
|
||||
# Add header and make executable - identically to 0o700
|
||||
os.chmod(outfile, stat.S_IXUSR | stat.S_IRUSR | stat.S_IWUSR)
|
||||
|
||||
# Mark object as changed
|
||||
open(os.path.join(self.path.object_dir(cdist_object), "changed"), "w").close()
|
||||
# Mark object as changed
|
||||
open(os.path.join(self.path.object_dir(cdist_object), "changed"), "w").close()
|
||||
|
||||
|
||||
if mode == "code":
|
||||
local_dir = self.path.object_dir(cdist_object)
|
||||
remote_dir = self.path.remote_object_dir(cdist_object)
|
||||
if mode == "code":
|
||||
local_dir = self.path.object_dir(cdist_object)
|
||||
remote_dir = self.path.remote_object_dir(cdist_object)
|
||||
|
||||
bin = os.path.join(local_dir, "code-local")
|
||||
if os.path.isfile(bin):
|
||||
cdist.exec.run_or_fail([bin])
|
||||
|
||||
bin = os.path.join(local_dir, "code-local")
|
||||
if os.path.isfile(bin):
|
||||
cdist.exec.run_or_fail([bin])
|
||||
|
||||
|
||||
local_remote_code = os.path.join(local_dir, "code-remote")
|
||||
remote_remote_code = os.path.join(remote_dir, "code-remote")
|
||||
if os.path.isfile(local_remote_code):
|
||||
self.path.transfer_file(local_remote_code, remote_remote_code)
|
||||
# FIXME: remote_prefix
|
||||
cdist.exec.run_or_fail([remote_remote_code], remote_prefix=self.remote_prefix)
|
||||
|
||||
def stage_prepare(self):
|
||||
"""Do everything for a deploy, minus the actual code stage"""
|
||||
self.init_deploy()
|
||||
self.run_global_explorers()
|
||||
self.run_initial_manifest()
|
||||
|
||||
log.info("Running object manifests and type explorers")
|
||||
local_remote_code = os.path.join(local_dir, "code-remote")
|
||||
remote_remote_code = os.path.join(remote_dir, "code-remote")
|
||||
if os.path.isfile(local_remote_code):
|
||||
self.path.transfer_file(local_remote_code, remote_remote_code)
|
||||
cdist.exec.run_or_fail([remote_remote_code], remote_prefix=True)
|
||||
|
||||
### Cleaned / check functions: Round 1 :-) #################################
|
||||
def stage_run(self):
|
||||
"""The final (and real) step of deployment"""
|
||||
log.info("Generating and executing code")
|
||||
# Now do the final steps over the existing objects
|
||||
for cdist_object in cdist.core.Object.list_objects():
|
||||
log.debug("Run object: %s", cdist_object)
|
||||
self.object_run(cdist_object, mode="gencode")
|
||||
self.object_run(cdist_object, mode="code")
|
||||
|
||||
old_objects = []
|
||||
objects = self.path.list_objects()
|
||||
def deploy_to(self):
|
||||
"""Mimic the old deploy to: Deploy to one host"""
|
||||
log.info("Deploying to " + self.target_host)
|
||||
self.stage_prepare()
|
||||
self.stage_run()
|
||||
|
||||
# Continue process until no new objects are created anymore
|
||||
while old_objects != objects:
|
||||
old_objects = list(objects)
|
||||
for cdist_object in objects:
|
||||
if cdist_object in self.objects_prepared:
|
||||
log.debug("Skipping rerun of object %s", cdist_object)
|
||||
continue
|
||||
else:
|
||||
# FIXME: run_type_explorer:
|
||||
# object can return type
|
||||
# type has explorers
|
||||
# path knows about where to save explorer output
|
||||
# type = self.path.objects[object].type()
|
||||
# self.path.types['type'].explorers()
|
||||
# for explorer in explorers:
|
||||
# output = cdist.exec.run_debug_or_fail_shell(explorer)
|
||||
# if output:
|
||||
# write_output_to(output, os.path.join(self.path.objects[object].explorer_dir(),explorer) )
|
||||
#
|
||||
self.run_type_explorer(cdist_object)
|
||||
self.run_type_manifest(cdist_object)
|
||||
self.objects_prepared.append(cdist_object)
|
||||
def deploy_and_cleanup(self):
|
||||
"""Do what is most often done: deploy & cleanup"""
|
||||
self.deploy_to()
|
||||
self.cleanup()
|
||||
|
||||
objects = self.path.list_objects()
|
||||
def init_deploy(self):
|
||||
"""Ensure the base directories are cleaned up"""
|
||||
log.debug("Creating clean directory structure")
|
||||
|
||||
def stage_run(self):
|
||||
"""The final (and real) step of deployment"""
|
||||
log.info("Generating and executing code")
|
||||
# Now do the final steps over the existing objects
|
||||
for cdist_object in self.path.list_objects():
|
||||
log.debug("Run object: %s", cdist_object)
|
||||
self.object_run(cdist_object, mode="gencode")
|
||||
self.object_run(cdist_object, mode="code")
|
||||
self.path.remove_remote_dir(cdist.path.REMOTE_BASE_DIR)
|
||||
self.path.remote_mkdir(cdist.path.REMOTE_BASE_DIR)
|
||||
self.link_emulator()
|
||||
|
||||
def stage_prepare(self):
|
||||
"""Do everything for a deploy, minus the actual code stage"""
|
||||
self.init_deploy()
|
||||
self.run_global_explorers()
|
||||
self.run_initial_manifest()
|
||||
|
||||
log.info("Running object manifests and type explorers")
|
||||
|
||||
def deploy_to(self):
|
||||
"""Mimic the old deploy to: Deploy to one host"""
|
||||
log.info("Deploying to " + self.target_host)
|
||||
time_start = datetime.datetime.now()
|
||||
log.debug("Searching for objects in " + cdist.core.Object.base_dir())
|
||||
|
||||
self.stage_prepare()
|
||||
self.stage_run()
|
||||
|
||||
time_end = datetime.datetime.now()
|
||||
duration = time_end - time_start
|
||||
log.info("Finished run of %s in %s seconds",
|
||||
self.target_host,
|
||||
duration.total_seconds())
|
||||
|
||||
def deploy_and_cleanup(self):
|
||||
"""Do what is most often done: deploy & cleanup"""
|
||||
self.deploy_to()
|
||||
self.cleanup()
|
||||
# Continue process until no new objects are created anymore
|
||||
new_objects_created = True
|
||||
while new_objects_created:
|
||||
new_objects_created = False
|
||||
for cdist_object in cdist.core.Object.list_objects():
|
||||
if cdist_object.prepared:
|
||||
log.debug("Skipping rerun of object %s", cdist_object)
|
||||
continue
|
||||
else:
|
||||
log.debug("Preparing object: " + cdist_object.name)
|
||||
self.run_type_explorer(cdist_object)
|
||||
self.run_type_manifest(cdist_object)
|
||||
cdist_object.prepared = True
|
||||
new_objects_created = True
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# 2010-2011 Steven Armstrong (steven-cdist at armstrong.cc)
|
||||
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
|
||||
# 2011 Nico Schottelius (nico-cdist at schottelius.org)
|
||||
#
|
||||
# This file is part of cdist.
|
||||
#
|
||||
|
|
@ -19,12 +20,14 @@
|
|||
#
|
||||
#
|
||||
|
||||
import logging
|
||||
import os
|
||||
import collections
|
||||
|
||||
import cdist
|
||||
import cdist.core.property
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
DOT_CDIST = '.cdist'
|
||||
|
||||
|
|
@ -65,7 +68,7 @@ class Object(object):
|
|||
for object_name in cls.list_object_names():
|
||||
type_name = object_name.split(os.sep)[0]
|
||||
object_id = os.sep.join(object_name.split(os.sep)[1:])
|
||||
yield cls(Type(type_name), object_id=object_id)
|
||||
yield cls(cdist.core.Type(type_name), object_id=object_id)
|
||||
|
||||
@classmethod
|
||||
def list_type_names(cls):
|
||||
|
|
@ -89,6 +92,10 @@ class Object(object):
|
|||
|
||||
self.__parameters = None
|
||||
self.__requirements = None
|
||||
|
||||
# Whether this object was prepared/ran
|
||||
self.prepared = False
|
||||
self.ran = False
|
||||
|
||||
def __repr__(self):
|
||||
return '<Object %s>' % self.name
|
||||
|
|
|
|||
|
|
@ -77,6 +77,8 @@ def run(argv):
|
|||
|
||||
object_dir = os.path.join(global_dir, "object", type,
|
||||
object_id, cdist.path.DOT_CDIST)
|
||||
log.debug("Object output dir = " + object_dir)
|
||||
|
||||
param_out_dir = os.path.join(object_dir, "parameter")
|
||||
|
||||
object_source_file = os.path.join(object_dir, "source")
|
||||
|
|
@ -127,7 +129,7 @@ def run(argv):
|
|||
param_fd.close()
|
||||
|
||||
# Record requirements
|
||||
if "__require" in os.environ:
|
||||
if "require" in os.environ:
|
||||
requirements = os.environ['__require']
|
||||
log.debug(object_id + ":Writing requirements: " + requirements)
|
||||
require_fd = open(os.path.join(object_dir, "require"), "a")
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
#
|
||||
|
||||
import logging
|
||||
import os
|
||||
import subprocess
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
|
@ -32,6 +33,8 @@ def shell_run_or_debug_fail(script, *args, remote_prefix=False, **kargs):
|
|||
args[0][:0] = [ "/bin/sh", "-e" ]
|
||||
|
||||
if remote_prefix:
|
||||
remote_prefix = os.environ['__remote_exec'].split()
|
||||
remote_prefix.append(os.environ['target_host'])
|
||||
args[0][:0] = remote_prefix
|
||||
|
||||
log.debug("Shell exec cmd: %s", args)
|
||||
|
|
@ -43,6 +46,7 @@ def shell_run_or_debug_fail(script, *args, remote_prefix=False, **kargs):
|
|||
subprocess.check_call(*args, **kargs)
|
||||
except subprocess.CalledProcessError:
|
||||
log.error("Code that raised the error:\n")
|
||||
|
||||
if remote_prefix:
|
||||
run_or_fail(["cat", script], remote_prefix=remote_prefix)
|
||||
|
||||
|
|
@ -60,6 +64,8 @@ def shell_run_or_debug_fail(script, *args, remote_prefix=False, **kargs):
|
|||
|
||||
def run_or_fail(*args, remote_prefix=False, **kargs):
|
||||
if remote_prefix:
|
||||
remote_prefix = os.environ['__remote_exec'].split()
|
||||
remote_prefix.append(os.environ['target_host'])
|
||||
args[0][:0] = remote_prefix
|
||||
|
||||
log.debug("Exec: " + " ".join(*args))
|
||||
|
|
|
|||
|
|
@ -27,9 +27,6 @@ import cdist.config_install
|
|||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
Class Install(cdist.config_install.ConfigInstall):
|
||||
pass
|
||||
|
||||
def install(args):
|
||||
"""Install remote system"""
|
||||
process = {}
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# 2010-2011 Steven Armstrong (steven-cdist at armstrong.cc)
|
||||
#
|
||||
# This file is part of cdist.
|
||||
#
|
||||
# cdist is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# cdist is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
#
|
||||
|
||||
import os
|
||||
import logging
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
||||
class Object(object):
|
||||
|
||||
def __init__(self, path, remote_path, object_fq):
|
||||
self.path = path
|
||||
self.remote_path = remote_path
|
||||
self.object_fq = object_fq
|
||||
self.type = self.object_fq.split(os.sep)[0]
|
||||
self.object_id = self.object_fq.split(os.sep)[1:]
|
||||
self.parameter_dir = os.path.join(self.path, "parameter")
|
||||
self.remote_object_parameter_dir = os.path.join(self.remote_path, "parameter")
|
||||
self.object_code_paths = [
|
||||
os.path.join(self.path, "code-local"),
|
||||
os.path.join(self.path, "code-remote")]
|
||||
|
||||
@property
|
||||
def type_explorer_output_dir(self):
|
||||
"""Returns and creates dir of the output for a type explorer"""
|
||||
if not self.__type_explorer_output_dir:
|
||||
dir = os.path.join(self.path, "explorer")
|
||||
if not os.path.isdir(dir):
|
||||
os.mkdir(dir)
|
||||
self.__type_explorer_output_dir = dir
|
||||
return self.__type_explorer_output_dir
|
||||
|
||||
|
|
@ -57,8 +57,6 @@ class Path:
|
|||
|
||||
def __init__(self,
|
||||
target_host,
|
||||
remote_user,
|
||||
remote_prefix,
|
||||
initial_manifest=False,
|
||||
base_dir=None,
|
||||
debug=False):
|
||||
|
|
@ -70,10 +68,8 @@ class Path:
|
|||
self.base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
|
||||
|
||||
self.temp_dir = tempfile.mkdtemp()
|
||||
self.target_host = target_host
|
||||
|
||||
self.remote_user = remote_user
|
||||
self.remote_prefix = remote_prefix
|
||||
self.target_host = target_host
|
||||
|
||||
# Input directories
|
||||
self.conf_dir = os.path.join(self.base_dir, "conf")
|
||||
|
|
@ -96,6 +92,8 @@ class Path:
|
|||
self.object_base_dir = os.path.join(self.out_dir, "object")
|
||||
self.bin_dir = os.path.join(self.out_dir, "bin")
|
||||
|
||||
os.environ['__cdist_out_dir'] = self.out_dir
|
||||
|
||||
# List of type explorers transferred
|
||||
self.type_explorers_transferred = {}
|
||||
|
||||
|
|
@ -117,7 +115,7 @@ class Path:
|
|||
shutil.rmtree(self.cache_dir)
|
||||
shutil.move(self.temp_dir, self.cache_dir)
|
||||
|
||||
|
||||
|
||||
def __init_out_dirs(self):
|
||||
"""Initialise output directory structure"""
|
||||
os.mkdir(self.out_dir)
|
||||
|
|
@ -135,28 +133,24 @@ class Path:
|
|||
# FIXME: belongs to here - clearify remote*
|
||||
def remote_mkdir(self, directory):
|
||||
"""Create directory on remote side"""
|
||||
cdist.exec.run_or_fail(["mkdir", "-p", directory], remote_prefix=self.remote_prefix)
|
||||
cdist.exec.run_or_fail(["mkdir", "-p", directory], remote_prefix=True)
|
||||
|
||||
# FIXME: belongs to here - clearify remote*
|
||||
def remove_remote_dir(self, destination):
|
||||
cdist.exec.run_or_fail(["rm", "-rf", destination], remote_prefix=self.remote_prefix)
|
||||
cdist.exec.run_or_fail(["rm", "-rf", destination], remote_prefix=True)
|
||||
|
||||
# FIXME: belongs to here - clearify remote*
|
||||
def transfer_dir(self, source, destination):
|
||||
"""Transfer directory and previously delete the remote destination"""
|
||||
self.remove_remote_dir(destination)
|
||||
cdist.exec.run_or_fail(["scp", "-qr", source,
|
||||
self.remote_user + "@" +
|
||||
self.target_host + ":" +
|
||||
destination])
|
||||
cdist.exec.run_or_fail(os.environ['__remote_copy'].split() +
|
||||
["-r", source, self.target_host + ":" + destination])
|
||||
|
||||
# FIXME: belongs to here - clearify remote*
|
||||
def transfer_file(self, source, destination):
|
||||
"""Transfer file"""
|
||||
cdist.exec.run_or_fail(["scp", "-q", source,
|
||||
self.remote_user + "@" +
|
||||
self.target_host + ":" +
|
||||
destination])
|
||||
cdist.exec.run_or_fail(os.environ['__remote_copy'].split() +
|
||||
[source, self.target_host + ":" + destination])
|
||||
|
||||
# FIXME: Explorer or stays
|
||||
def global_explorer_output_path(self, explorer):
|
||||
|
|
@ -198,11 +192,6 @@ class Path:
|
|||
|
||||
return object_paths
|
||||
|
||||
# FIXME: Object
|
||||
def get_type_from_object(self, cdist_object):
|
||||
"""Returns the first part (i.e. type) of an object"""
|
||||
return cdist_object.split(os.sep)[0]
|
||||
|
||||
# FIXME: Object
|
||||
def get_object_id_from_object(self, cdist_object):
|
||||
"""Returns everything but the first part (i.e. object_id) of an object"""
|
||||
|
|
@ -266,19 +255,19 @@ class Path:
|
|||
# Stays here - FIXME: adjust to type code, loop over types!
|
||||
def transfer_type_explorers(self, type):
|
||||
"""Transfer explorers of a type, but only once"""
|
||||
if type in self.type_explorers_transferred:
|
||||
if type.transferred:
|
||||
log.debug("Skipping retransfer for explorers of %s", type)
|
||||
return
|
||||
else:
|
||||
# Do not retransfer
|
||||
self.type_explorers_transferred[type] = 1
|
||||
type.transferred = True
|
||||
|
||||
src = self.type_dir(type, "explorer")
|
||||
remote_base = os.path.join(REMOTE_TYPE_DIR, type)
|
||||
dst = self.remote_type_explorer_dir(type)
|
||||
# FIXME: Can be explorer_path or explorer_dir, I don't care.
|
||||
src = type.explorer_path()
|
||||
dst = type.remote_explorer_path()
|
||||
|
||||
# Only continue, if there is at least the directory
|
||||
if os.path.isdir(src):
|
||||
# Transfer if there is at least one explorer
|
||||
if len(type.explorers) > 0:
|
||||
# Ensure that the path exists
|
||||
self.remote_mkdir(remote_base)
|
||||
self.remote_mkdir(dst)
|
||||
self.transfer_dir(src, dst)
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# 2011 Nico Schottelius (nico-cdist at schottelius.org)
|
||||
#
|
||||
# This file is part of cdist.
|
||||
#
|
||||
# cdist is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# cdist is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
#
|
||||
|
||||
import logging
|
||||
import os
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
class Type(object):
|
||||
|
||||
def __init__(self, path, remote_path):
|
||||
self.path = path
|
||||
self.remote_path = remote_path
|
||||
|
||||
def list_explorers(self):
|
||||
"""Return list of available explorers"""
|
||||
dir = os.path.join(self.path, "explorer")
|
||||
if os.path.isdir(dir):
|
||||
list = os.listdir(dir)
|
||||
else:
|
||||
list = []
|
||||
|
||||
log.debug("Explorers for %s in %s: %s", type, dir, list)
|
||||
|
||||
return list
|
||||
|
||||
def is_install(self):
|
||||
"""Check whether a type is used for installation (if not: for configuration)"""
|
||||
return os.path.isfile(os.path.join(self.path, "install"))
|
||||
|
||||
def remote_explorer_dir(self):
|
||||
"""Return remote directory that holds the explorers of a type"""
|
||||
return os.path.join(self.remote_path, "explorer")
|
||||
Loading…
Add table
Add a link
Reference in a new issue