salt/home
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wmstartup: Minor change to execution order

Browse Source
This commit is contained in:
Salt 2018-08-27 20:50:23 -05:00
parent e96a76e29a
commit 150127751f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.config/dtfscripts/wmstartup.sh
View File

@ -85,17 +85,6 @@ else
dtf_log "Performing a subset of all tasks" dtf_log "Performing a subset of all tasks"
fi fi
## Determine which services to run
# Same as above
if [[ "$DTF_SERVICES" == "" ]]; then
dtf_log "Starting all available services"
for service in $DTF_SERVICES_DIR/*.dtf; do
export DTF_SERVICES="$DTF_SERVICES $(basename "$service")"
done
else
dtf_log "Starting a subset of available services"
fi
## Run tasks ## Run tasks
for task in $DTF_TASKS; do for task in $DTF_TASKS; do
task_full="$DTF_TASKS_DIR/$task" task_full="$DTF_TASKS_DIR/$task"
@ -113,6 +102,17 @@ for task in $DTF_TASKS; do
) )
done done
## Determine which services to run
# Same as above
if [[ "$DTF_SERVICES" == "" ]]; then
dtf_log "Starting all available services"
for service in $DTF_SERVICES_DIR/*.dtf; do
export DTF_SERVICES="$DTF_SERVICES $(basename "$service")"
done
else
dtf_log "Starting a subset of available services"
fi
## Run startup scripts ## Run startup scripts
for service in $DTF_SERVICES; do for service in $DTF_SERVICES; do
service_full="$DTF_SERVICES_DIR/$service" service_full="$DTF_SERVICES_DIR/$service"