mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2026-08-26 17:38:23 +02:00
so-boot-highstate.service was never enabled outside managers: only the
manager branch of so-setup called mark_setup_complete, so the marker its
service.enabled gates on never existed on sensors, search nodes, receivers,
etc.
Move the marker state into salt.minion.boot_highstate as the sole owner
within a highstate. Non-managers never apply salt.minion during setup, so
reaching it means setup is done and the marker is unconditional -- this also
heals already-installed nodes. Managers keep the legacy startup_states gate,
since they do highstate mid-setup.
Also add the marker to setup.virt for salt-cloud guests (replacing the
startup_states line removed in fabecb82) and to so-setup's non-manager branch.
23 lines
829 B
YAML+Jinja
23 lines
829 B
YAML+Jinja
# 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.
|
|
|
|
set_role_grain:
|
|
grains.present:
|
|
- name: role
|
|
- value: so-{{ grains.id.split("_") | last }}
|
|
|
|
# salt-cloud guests never run so-setup, so nothing else marks them setup-complete.
|
|
# Replaces the 'startup_states: highstate' line this state used to append. No
|
|
# GLOBALS import -- this runs before the guest's pillars exist.
|
|
mark_setup_complete_vm_guest:
|
|
file.managed:
|
|
- name: /opt/so/state/setup-complete
|
|
- replace: false
|
|
- makedirs: True
|
|
|
|
enable_salt_minion:
|
|
service.enabled:
|
|
- name: salt-minion
|