Move ntp server array to its own pillar in the minion sls file

This commit is contained in:
William Wernert
2021-03-31 09:14:40 -04:00
parent 177989269f
commit c03e2b2c11
2 changed files with 16 additions and 9 deletions

View File

@@ -1591,7 +1591,6 @@ manager_pillar() {
printf '%s\n'\
" kratoskey: '$KRATOSKEY'"\
"" >> "$pillar_file"
}
manager_global() {
@@ -1620,12 +1619,7 @@ manager_global() {
" mdengine: '$ZEEKVERSION'"\
" ids: '$NIDS'"\
" url_base: '$REDIRECTIT'"\
" managerip: '$MAINIP'"\
" ntp_servers:" > "$global_pillar"
for addr in "${ntp_servers[@]}"; do
echo " - '$addr'" >> "$global_pillar"
done
" managerip: '$MAINIP'" > "$global_pillar"
if [[ $is_airgap ]]; then
printf '%s\n'\
@@ -1775,7 +1769,6 @@ manager_global() {
"redis_settings:"\
" redis_maxmemory: 812" >> "$global_pillar"
printf '%s\n' '----' >> "$setup_log" 2>&1
}
@@ -1837,6 +1830,19 @@ network_setup() {
} >> "$setup_log" 2>&1
}
ntp_pillar() {
local pillar_file="$temp_install_dir"/pillar/minions/"$MINION_ID".sls
if [[ ${#ntp_servers[@]} -gt 0 ]]; then
printf '%s\n'\
"ntp:"\
" servers:" >> "$global_pillar"
for addr in "${ntp_servers[@]}"; do
printf '%s\n' " - '$addr'" >> "$pillar_file"
done
fi
}
parse_install_username() {
# parse out the install username so things copy correctly
INSTALLUSERNAME=${SUDO_USER:-${USER}}

View File

@@ -584,6 +584,7 @@ set_redirect >> $setup_log 2>&1
set_progress_str 0 'Running initial configuration steps'
[[ ${#ntp_servers[@]} -gt 0 ]] && configure_ntp >> $setup_log 2>&1
ntp_pillar >> $setup_log 2>&1
reserve_ports