Merge remote branch 'nico/executionorder' into executionorder

This commit is contained in:
Steven Armstrong 2011-03-29 16:40:40 +02:00
commit bd4194cff9
3 changed files with 15 additions and 18 deletions

View file

@ -122,6 +122,8 @@ __cdist_tmp_file=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX")
: ${__cdist_out_type_dir:=$__cdist_out_dir/$__cdist_name_type} : ${__cdist_out_type_dir:=$__cdist_out_dir/$__cdist_name_type}
: ${__cdist_out_type_bin_dir:=$__cdist_out_dir/$__cdist_name_type_bin} : ${__cdist_out_type_bin_dir:=$__cdist_out_dir/$__cdist_name_type_bin}
: ${__cdist_objects_created:=$__cdist_out_object_dir/$__cdist_name_objects_created}
################################################################################ ################################################################################
# Remote base # Remote base
# #
@ -139,10 +141,6 @@ __cdist_tmp_file=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX")
: ${__cdist_remote_out_explorer_dir:=$__cdist_remote_out_dir/$__cdist_name_explorer} : ${__cdist_remote_out_explorer_dir:=$__cdist_remote_out_dir/$__cdist_name_explorer}
: ${__cdist_remote_out_object_dir:=$__cdist_remote_out_dir/$__cdist_name_object} : ${__cdist_remote_out_object_dir:=$__cdist_remote_out_dir/$__cdist_name_object}
################################################################################
# Global internal variables
#
: ${__cdist_objects_created:=$__cdist_out_object_dir/$__cdist_name_objects_created}
################################################################################ ################################################################################
# Internal functions # Internal functions
@ -187,11 +185,13 @@ __cdist_init_deploy()
ln -sf "$__cdist_conf_dir" "$__cdist_local_base_dir/$__cdist_name_conf_dir" ln -sf "$__cdist_conf_dir" "$__cdist_local_base_dir/$__cdist_name_conf_dir"
} }
__cdist_new_objects_created() { __cdist_new_objects_created()
{
touch "$__cdist_tmp_dir/object_created" touch "$__cdist_tmp_dir/object_created"
} }
__cdist_has_new_objects() { __cdist_has_new_objects()
{
touch "$__cdist_tmp_dir/object_created" touch "$__cdist_tmp_dir/object_created"
} }
@ -269,7 +269,6 @@ __cdist_object_type_explorer_dir()
echo "$(__cdist_object_dir "$1")/${__cdist_name_explorer}" echo "$(__cdist_object_dir "$1")/${__cdist_name_explorer}"
} }
################################################################################ ################################################################################
# Remote # Remote
# #

View file

@ -17,5 +17,3 @@ Types to be written/extended:
- regexp replace (can probably cover all?) - regexp replace (can probably cover all?)
-> aka sed. -> aka sed.
- __cron - __cron

View file

@ -23,8 +23,8 @@ Before running the user facing stages, cdist prepares the target host
to contain cdist binaries and creates a clean environment for the to contain cdist binaries and creates a clean environment for the
configuration run. configuration run.
Related manpages: Related documentation:
- cdist-bin-transfer(1) FIXME: does not exist - Source of cdist-deploy-to
STAGE 1: TARGET INFORMATION RETRIEVAL STAGE 1: TARGET INFORMATION RETRIEVAL
@ -34,7 +34,7 @@ explorers. Every existing explorer is run on the target and the output of all
explorers are copied back into the local cache. The results can be used by explorers are copied back into the local cache. The results can be used by
manifests and types. manifests and types.
Related manpages: Related documentation:
- cdist-explorer-run-global(1) - cdist-explorer-run-global(1)
- cdist-remote-explorer-run(1) - cdist-remote-explorer-run(1)
- cdist-explorer(7) - cdist-explorer(7)
@ -48,7 +48,7 @@ the objects as defined in the manifest for the specific host. In this stage,
no conflicts may occur, i.e. no object of the same type with the same id may no conflicts may occur, i.e. no object of the same type with the same id may
be created. be created.
Related manpages: Related documentation:
- cdist-manifest-run-init(1) - cdist-manifest-run-init(1)
- cdist-manifest-run(1) - cdist-manifest-run(1)
- cdist-manifest(7) - cdist-manifest(7)
@ -61,7 +61,7 @@ transfered to the target host and executed. The results are transfered back
and can be used in the following stages to decide what changes need to made and can be used in the following stages to decide what changes need to made
on the target to implement the desired state. on the target to implement the desired state.
Related manpages: Related documentation:
- cdist-object-explorer-run(1) - cdist-object-explorer-run(1)
- cdist-remote-explorer-run(1) - cdist-remote-explorer-run(1)
- cdist-type(7) - cdist-type(7)
@ -82,7 +82,7 @@ The newly created objects are merged back into the existing tree. No conflicts
may occur during the merge. A conflict would mean that two different objects may occur during the merge. A conflict would mean that two different objects
try to create the same object, which indicates a broken configuration. try to create the same object, which indicates a broken configuration.
Related manpages: Related documentation:
- cdist-object-manifest-run(1) - cdist-object-manifest-run(1)
- cdist-manifest-run(1) - cdist-manifest-run(1)
- cdist-type(7) - cdist-type(7)
@ -96,7 +96,7 @@ be executed. This executable should create code to be executed on the target
on stdout. If the gencode executable fails, it must print diagnostic messages on stdout. If the gencode executable fails, it must print diagnostic messages
on stderr and exit non-zero. on stderr and exit non-zero.
Related manpages: Related documentation:
- cdist-object-gencode-run(1) - cdist-object-gencode-run(1)
- cdist-object-gencode(1) - cdist-object-gencode(1)
- cdist-type(7) - cdist-type(7)
@ -107,7 +107,7 @@ STAGE 6: CODE EXECUTION
For every object the resulting code from the previous stage is transferred to For every object the resulting code from the previous stage is transferred to
the target host and executed there to apply the configuration changes. the target host and executed there to apply the configuration changes.
Related manpages: Related documentation:
- cdist-object-code-run(1) - cdist-object-code-run(1)
- cdist-code-run(1) - cdist-code-run(1)
@ -116,7 +116,7 @@ STAGE 7: CACHE
-------------- --------------
The cache stores the information from the current run for later use. The cache stores the information from the current run for later use.
Related manpages: Related documentation:
- cdist-cache(1) - cdist-cache(1)