CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15066 from Security-Onion-Solutions/vlb2

Browse Source 
set interface for network.ip_addrs for hypervisors
This commit is contained in:
Josh Patterson
2025-09-24 16:51:07 -04:00
committed by GitHub
parent e826ea5d04 c836dd2acd
commit a91e8b26f6
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
salt/libvirt/bridge.sls
View File

@@ -6,6 +6,7 @@
# We do not import GLOBALS in this state because it is called during setup # We do not import GLOBALS in this state because it is called during setup
include: include:
- salt.minion.service_file - salt.minion.service_file
- salt.mine_functions
down_original_mgmt_interface: down_original_mgmt_interface:
cmd.run: cmd.run:
@@ -32,6 +33,7 @@ wait_for_br0_ip:
- cmd: down_original_mgmt_interface - cmd: down_original_mgmt_interface
- onchanges_in: - onchanges_in:
- file: salt_minion_service_unit_file - file: salt_minion_service_unit_file
- file: mine_functions
restart_salt_minion_service: restart_salt_minion_service:
service.running: service.running:
@@ -39,3 +41,4 @@ restart_salt_minion_service:
- enable: True - enable: True
- listen: - listen:
- file: salt_minion_service_unit_file - file: salt_minion_service_unit_file
- file: mine_functions

2
salt/salt/map.jinja
View File

@@ -4,7 +4,7 @@
Elastic License 2.0. #} Elastic License 2.0. #}
{% set role = salt['grains.get']('role', '') %} {% set role = salt['grains.get']('role', '') %}
{% if role in ['so-hypervisor','so-managerhype'] and salt['network.ip_addrs']('br0')|length > 0 %} {% if role in ['so-hypervisor','so-managerhype'] %}
{% set interface = 'br0' %} {% set interface = 'br0' %}
{% else %} {% else %}
{% set interface = pillar.host.mainint %} {% set interface = pillar.host.mainint %}

4
setup/so-functions
View File

@@ -1195,7 +1195,9 @@ hypervisor_local_states() {
logCmd "salt-call state.apply libvirt.64962 --local --file-root=../salt/ -l info queue=True" logCmd "salt-call state.apply libvirt.64962 --local --file-root=../salt/ -l info queue=True"
info "Setting up bridge for $MNIC" info "Setting up bridge for $MNIC"
salt-call state.apply libvirt.bridge --local --file-root=../salt/ -l info pillar='{"host": {"mainint": "'$MNIC'"}}' queue=True salt-call state.apply libvirt.bridge --local --file-root=../salt/ -l info pillar='{"host": {"mainint": "'$MNIC'"}}' queue=True
logCmd "salt-call state.apply salt.minion queue=True" if [ $is_managerhype ]; then
logCmd "salt-call state.apply salt.minion queue=True"
fi
fi fi
} }