forked from ungleich-public/cdist
cdist-object-code-run -> ../core/__cdist_object_code_run
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
9e246b18ed
commit
27a810705e
2 changed files with 11 additions and 12 deletions
|
@ -59,7 +59,7 @@ if [ ! -f "$__cdist_object_finished" ]; then
|
||||||
__cdist_object_gencode_run "$__cdist_object_self"
|
__cdist_object_gencode_run "$__cdist_object_self"
|
||||||
__cdist_dir push "$(__cdist_object_dir "$__cdist_object_self")" \
|
__cdist_dir push "$(__cdist_object_dir "$__cdist_object_self")" \
|
||||||
"$(__cdist_remote_object_dir "$__cdist_object_self")"
|
"$(__cdist_remote_object_dir "$__cdist_object_self")"
|
||||||
cdist-object-code-run "$__cdist_target_host" "$__cdist_object_self"
|
__cdist_object_code_run "$__cdist_object_self"
|
||||||
|
|
||||||
# Mark this object as done
|
# Mark this object as done
|
||||||
touch "$__cdist_object_finished"
|
touch "$__cdist_object_finished"
|
||||||
|
|
|
@ -22,17 +22,16 @@
|
||||||
# Exec the code for the given object locally and remote
|
# Exec the code for the given object locally and remote
|
||||||
#
|
#
|
||||||
|
|
||||||
. cdist-config
|
__cdist_object_code_run()
|
||||||
[ $# -eq 2 ] || __cdist_usage "<target host> <object>"
|
{
|
||||||
set -e
|
|
||||||
|
|
||||||
__cdist_target_host="$1"; shift
|
__cdist_object_code_run_object="$1"; shift
|
||||||
__cdist_object="$1"; shift
|
|
||||||
|
|
||||||
# Code local
|
# Code local
|
||||||
export __cdist_out_object_dir="$__cdist_out_object_dir"
|
export __cdist_out_object_dir="$__cdist_out_object_dir"
|
||||||
cdist-code-run "$__cdist_object" "${__cdist_name_gencode_local}"
|
cdist-code-run "$__cdist_object_code_run_object" "${__cdist_name_gencode_local}"
|
||||||
|
|
||||||
# Code remote
|
# Code remote
|
||||||
cdist-run-remote "$__cdist_target_host" \
|
cdist-run-remote "$__cdist_target_host" \
|
||||||
"cdist-code-run" "$__cdist_object" "${__cdist_name_gencode_remote}"
|
"cdist-code-run" "$__cdist_object_code_run_object" "${__cdist_name_gencode_remote}"
|
||||||
|
}
|
Loading…
Reference in a new issue