++__cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
cb5fc962b3
commit
ec513eae49
3 changed files with 3 additions and 2 deletions
|
@ -30,5 +30,5 @@ __cdist_target_host="$1"; shift
|
||||||
|
|
||||||
eval export $__cdist_name_var_manifest=\"\$__cdist_manifest_dir\"
|
eval export $__cdist_name_var_manifest=\"\$__cdist_manifest_dir\"
|
||||||
|
|
||||||
echo "Running initial manifest for $__cdist_target_host ..."
|
__cdist_echo info "Running initial manifest for $__cdist_target_host ..."
|
||||||
cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest_init"
|
cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest_init"
|
||||||
|
|
|
@ -42,6 +42,6 @@ done
|
||||||
|
|
||||||
# else wait after all are started
|
# else wait after all are started
|
||||||
if [ "$parallel" ]; then
|
if [ "$parallel" ]; then
|
||||||
echo "Waiting for cdist-deploy-to jobs to finish..."
|
__cdist_echo info "Waiting for cdist-deploy-to jobs to finish..."
|
||||||
wait
|
wait
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -31,6 +31,7 @@ __cdist_object="$1"; shift
|
||||||
|
|
||||||
__cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object")"
|
__cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object")"
|
||||||
__cdist_type="$(__cdist_type_from_object "$__cdist_object")"
|
__cdist_type="$(__cdist_type_from_object "$__cdist_object")"
|
||||||
|
__cdist_object_self="$__cdist_type/$__cdist_object_id"
|
||||||
|
|
||||||
# Check if type of object has >= 1 explorer
|
# Check if type of object has >= 1 explorer
|
||||||
__cdist_has_explorer="$(__cdist_type_has_explorer "$__cdist_type")"
|
__cdist_has_explorer="$(__cdist_type_has_explorer "$__cdist_type")"
|
||||||
|
|
Loading…
Reference in a new issue