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

replace usage of cdist-dir and use new syntax

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-06-14 00:19:57 +02:00
commit e6d2a301c9
4 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
bin/cdist-deploy-to
View file

@ -48,8 +48,7 @@ __cdist_init_deploy "$__cdist_target_host"
# Transfer cdist executables # Transfer cdist executables
__cdist_echo info "Transferring cdist binaries to the target host " __cdist_echo info "Transferring cdist binaries to the target host "
cdist-dir push "$__cdist_target_host" \ __cdist_dir push "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
"${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
cdist-explorer-run-global "$__cdist_target_host" cdist-explorer-run-global "$__cdist_target_host"
cdist-manifest-run-init "$__cdist_target_host" cdist-manifest-run-init "$__cdist_target_host"
cdist-object-all "$__cdist_target_host" cdist-object-prepare cdist-object-all "$__cdist_target_host" cdist-object-prepare

6
bin/cdist-explorer-run-global
View file

@ -30,8 +30,7 @@ __cdist_target_host="$1"; shift
__cdist_echo info "Running global explorers " __cdist_echo info "Running global explorers "
# copy the explorers # copy the explorers
cdist-dir push "$__cdist_target_host" \ __cdist_dir push "${__cdist_explorer_dir}" "${__cdist_remote_explorer_dir}"
"${__cdist_explorer_dir}" "${__cdist_remote_explorer_dir}"
# run the initial explorers remotely # run the initial explorers remotely
cdist-run-remote "${__cdist_target_host}" cdist-remote-explorer-run \ cdist-run-remote "${__cdist_target_host}" cdist-remote-explorer-run \
@ -39,5 +38,4 @@ cdist-run-remote "${__cdist_target_host}" cdist-remote-explorer-run \
"$__cdist_remote_out_explorer_dir" "$__cdist_remote_out_explorer_dir"
# retrieve the results # retrieve the results
cdist-dir pull "$__cdist_target_host" \ __cdist_dir pull "${__cdist_remote_out_explorer_dir}" "${__cdist_out_explorer_dir}"
"${__cdist_remote_out_explorer_dir}" "${__cdist_out_explorer_dir}"

7
bin/cdist-object-explorer-run
View file

@ -40,13 +40,13 @@ if [ "$__cdist_has_explorer" ]; then
src_dir="$(__cdist_type_explorer_dir "$__cdist_type")" src_dir="$(__cdist_type_explorer_dir "$__cdist_type")"
dst_dir="$(__cdist_remote_type_explorer_dir "$__cdist_type")" dst_dir="$(__cdist_remote_type_explorer_dir "$__cdist_type")"
__cdist_echo info "Transfering explorers for $__cdist_type " __cdist_echo info "Transfering explorers for $__cdist_type "
cdist-dir push "$__cdist_target_host" "$src_dir" "$dst_dir" __cdist_dir push "$src_dir" "$dst_dir"
__cdist_type_explorer_pushed_add "$__cdist_type" __cdist_type_explorer_pushed_add "$__cdist_type"
fi fi
__cdist_echo info "Running explorers" __cdist_echo info "Running explorers"
# Copy object parameters # Copy object parameters
cdist-dir push "$__cdist_target_host" \ __cdist_dir push \
"$(__cdist_object_parameter_dir "$__cdist_object_self")" \ "$(__cdist_object_parameter_dir "$__cdist_object_self")" \
"$(__cdist_remote_object_parameter_dir "$__cdist_object_self")" "$(__cdist_remote_object_parameter_dir "$__cdist_object_self")"
@ -61,7 +61,6 @@ if [ "$__cdist_has_explorer" ]; then
"$(__cdist_remote_object_type_explorer_dir "$__cdist_object_self")" "$(__cdist_remote_object_type_explorer_dir "$__cdist_object_self")"
# Copy back results # Copy back results
cdist-dir pull "$__cdist_target_host" \ __cdist_dir pull "$(__cdist_remote_object_type_explorer_dir "$__cdist_object_self")" \
"$(__cdist_remote_object_type_explorer_dir "$__cdist_object_self")" \
"$(__cdist_object_type_explorer_dir "$__cdist_object_self")" "$(__cdist_object_type_explorer_dir "$__cdist_object_self")"
fi fi

3
bin/cdist-object-push
View file

@ -30,6 +30,5 @@ __cdist_target_host="$1"; shift
__cdist_object_self="$1"; shift __cdist_object_self="$1"; shift
__cdist_echo info "Transferring object" __cdist_echo info "Transferring object"
cdist-dir push "$__cdist_target_host" \ __cdist_dir push "$(__cdist_object_dir "$__cdist_object_self")" \
"$(__cdist_object_dir "$__cdist_object_self")" \
"$(__cdist_remote_object_dir "$__cdist_object_self")" "$(__cdist_remote_object_dir "$__cdist_object_self")"