remove possible race condition caused by vm init cron for setup.virt.init. setup.virt and mine updated during salt-cloud call with init_script

This commit is contained in:
m0duspwnens
2025-01-29 14:23:10 -05:00
parent 3c85b48291
commit 8d1ce0460f
3 changed files with 9 additions and 32 deletions

View File

@@ -1,13 +0,0 @@
# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at
# https://securityonion.net/license; you may not use this file except in compliance with the
# Elastic License 2.0.
# initially tried to use schedule.present here, but that state trys to return data to the master even if run with --local
# that causes it to fail since th firewall may not yet be open on the manager
init_node_cron:
cron.present:
- name: salt-call state.apply setup.virt.init
- identifier: init_node_cron
- user: root
- minute: '*/1'

View File

@@ -8,21 +8,11 @@ set_role_grain:
- name: role
- value: so-{{ grains.id.split("_") | last }}
# remove the initial cron
remove_init_node_cron:
cron.absent:
- name: salt-call state.apply setup.virt.init
- identifier: init_node_cron
- user: root
set_highstate:
file.append:
- name: /etc/salt/minion
- text: 'startup_states: highstate'
restart_salt_minion:
service.running:
enable_salt_minion:
service.enabled:
- name: salt-minion
- enable: True
- watch:
- file: set_highstate