From 6d5af5b07ab9d0438374327b632d910ec794eb23 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Tue, 19 May 2020 12:41:19 -0400 Subject: [PATCH] [fix] Revert redirect fix for saltify and docker_seed_registry --- setup/so-setup | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setup/so-setup b/setup/so-setup index d5e56c81f..807fd206a 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -278,10 +278,10 @@ fi if [[ $is_sensor || $is_helix ]]; then set_progress_str 1 'Creating bond interface' - create_sensor_bond >> "$setup_log" 2>&1 + create_sensor_bond >> $setup_log 2>&1 set_progress_str 2 'Generating sensor pillar' - sensor_pillar >> "$setup_log" 2>&1 + sensor_pillar >> $setup_log 2>&1 fi if [[ $is_minion ]]; then @@ -290,7 +290,7 @@ fi fi set_progress_str 4 'Installing Salt and dependencies' - saltify >> $setup_log 2>&1 + saltify 2>> $setup_log set_progress_str 7 'Installing Docker and dependencies' docker_install >> $setup_log 2>&1 @@ -342,7 +342,7 @@ fi if [[ $is_master ]]; then set_progress_str 20 'Accepting Salt key' - salt-key -ya "$MINION_ID" >> "$setup_log" 2>&1 + salt-key -ya "$MINION_ID" >> $setup_log 2>&1 fi set_progress_str 21 'Copying minion pillars to master' @@ -362,8 +362,8 @@ fi set_progress_str 26 'Downloading containers from the internet' fi - salt-call state.apply -l info registry >> "$setup_log" 2>&1 - docker_seed_registry >> $setup_log 2>&1 # ~ 60% when finished + salt-call state.apply -l info registry >> $setup_log 2>&1 + docker_seed_registry 2>> "$setup_log" # ~ 60% when finished set_progress_str 61 "$(print_salt_state_apply 'master')" salt-call state.apply -l info master >> $setup_log 2>&1 @@ -402,7 +402,7 @@ fi if [[ $is_master ]]; then set_progress_str 69 "$(print_salt_state_apply 'soc')" - salt-call state.apply -l info soc >> "$setup_log" 2>&1 + salt-call state.apply -l info soc >> $setup_log 2>&1 set_progress_str 70 "$(print_salt_state_apply 'kibana')" salt-call state.apply -l info kibana >> $setup_log 2>&1