From 4599b95ae7d5b53d1ab047cc0540a9c268df0c7f Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Mon, 22 Sep 2025 16:37:16 -0400 Subject: [PATCH 1/8] separate salt-minion service file --- salt/libvirt/bridge.sls | 25 ++---- salt/salt/mine_functions.sls | 2 +- salt/salt/minion.sls | 124 ------------------------------ salt/salt/minion/service_file.sls | 26 +++++++ 4 files changed, 35 insertions(+), 142 deletions(-) delete mode 100644 salt/salt/minion.sls create mode 100644 salt/salt/minion/service_file.sls diff --git a/salt/libvirt/bridge.sls b/salt/libvirt/bridge.sls index b8f720993..ed405584e 100644 --- a/salt/libvirt/bridge.sls +++ b/salt/libvirt/bridge.sls @@ -4,6 +4,9 @@ # Elastic License 2.0. # We do not import GLOBALS in this state because it is called during setup +include: + - salt.mine_functions + - salt.minion.service_file down_original_mgmt_interface: cmd.run: @@ -28,29 +31,17 @@ wait_for_br0_ip: - timeout: 95 - onchanges: - cmd: down_original_mgmt_interface + - onchanges_in: + - file: salt_minion_service_unit_file + - file: mine_functions -{% if grains.role == 'so-hypervisor' %} - -update_mine_functions: - file.managed: - - name: /etc/salt/minion.d/mine_functions.conf - - contents: | - mine_interval: 25 - mine_functions: - network.ip_addrs: - - interface: br0 - {%- if role in ['so-eval','so-import','so-manager','so-managerhype','so-managersearch','so-standalone'] %} - x509.get_pem_entries: - - glob_path: '/etc/pki/ca.crt' - {% endif %} - - onchanges: - - cmd: wait_for_br0_ip +{% if grains.role in ['so-hypervisor', 'so-managerhype'] %} restart_salt_minion_service: service.running: - name: salt-minion - enable: True - listen: - - file: update_mine_functions + - file: mine_functions {% endif %} diff --git a/salt/salt/mine_functions.sls b/salt/salt/mine_functions.sls index ed786e997..ae3df1ce9 100644 --- a/salt/salt/mine_functions.sls +++ b/salt/salt/mine_functions.sls @@ -3,7 +3,7 @@ # https://securityonion.net/license; you may not use this file except in compliance with the # Elastic License 2.0. -# this state was seperated from salt.minion state since it is called during setup +# this state was separated from salt.minion state since it is called during setup # GLOBALS are imported in the salt.minion state and that is not available at that point in setup # this state is included in the salt.minion state diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls deleted file mode 100644 index b85fad1c0..000000000 --- a/salt/salt/minion.sls +++ /dev/null @@ -1,124 +0,0 @@ -{% from 'vars/globals.map.jinja' import GLOBALS %} -{% from 'salt/map.jinja' import UPGRADECOMMAND with context %} -{% from 'salt/map.jinja' import SALTVERSION %} -{% from 'salt/map.jinja' import INSTALLEDSALTVERSION %} -{% from 'salt/map.jinja' import SALTPACKAGES %} -{% from 'salt/map.jinja' import SYSTEMD_UNIT_FILE %} -{% import_yaml 'salt/minion.defaults.yaml' as SALTMINION %} - -include: - - salt.python_modules - - salt.patch.x509_v2 - - salt - - systemd.reload - - repo.client - - salt.mine_functions -{% if GLOBALS.role in GLOBALS.manager_roles %} - - ca -{% endif %} - -{% if INSTALLEDSALTVERSION|string != SALTVERSION|string %} - -{# this is added in 2.4.120 to remove salt repo files pointing to saltproject.io to accomodate the move to broadcom and new bootstrap-salt script #} -{% if salt['pkg.version_cmp'](GLOBALS.so_version, '2.4.120') == -1 %} -{% set saltrepofile = '/etc/yum.repos.d/salt.repo' %} -{% if grains.os_family == 'Debian' %} -{% set saltrepofile = '/etc/apt/sources.list.d/salt.list' %} -{% endif %} -remove_saltproject_io_repo_minion: - file.absent: - - name: {{ saltrepofile }} -{% endif %} - -unhold_salt_packages: - pkg.unheld: - - pkgs: -{% for package in SALTPACKAGES %} - - {{ package }} -{% endfor %} - -install_salt_minion: - cmd.run: - - name: /bin/sh -c '{{ UPGRADECOMMAND }}' - -# minion service is in failed state after upgrade. this command will start it after the state run for the upgrade completes -start_minion_post_upgrade: - cmd.run: - - name: | - exec 0>&- # close stdin - exec 1>&- # close stdout - exec 2>&- # close stderr - nohup /bin/sh -c 'sleep 30; systemctl start salt-minion' & - - require: - - cmd: install_salt_minion - - watch: - - cmd: install_salt_minion - - order: last - -{% endif %} - -{% if INSTALLEDSALTVERSION|string == SALTVERSION|string %} - -{% for package in SALTPACKAGES %} -# only hold the package if it is already installed -{% if salt['pkg.version'](package) %} -hold_{{ package }}_package: - pkg.held: - - name: {{ package }} - - version: {{SALTVERSION}}-0.* -{% endif %} -{% endfor %} - -remove_error_log_level_logfile: - file.line: - - name: /etc/salt/minion - - match: "log_level_logfile: error" - - mode: delete - -remove_error_log_level: - file.line: - - name: /etc/salt/minion - - match: "log_level: error" - - mode: delete - -set_log_levels: - file.append: - - name: /etc/salt/minion - - text: - - "log_level: info" - - "log_level_logfile: info" - -enable_startup_states: - file.uncomment: - - name: /etc/salt/minion - - regex: '^startup_states: highstate$' - - unless: pgrep so-setup - -# prior to 2.4.30 this managed file would restart the salt-minion service when updated -# since this file is currently only adding a delay service start -# it is not required to restart the service -salt_minion_service_unit_file: - file.managed: - - name: {{ SYSTEMD_UNIT_FILE }} - - source: salt://salt/service/salt-minion.service.jinja - - template: jinja - - onchanges_in: - - module: systemd_reload - -{% endif %} - -# this has to be outside the if statement above since there are _in calls to this state -salt_minion_service: - service.running: - - name: salt-minion - - enable: True - - onlyif: test "{{INSTALLEDSALTVERSION}}" == "{{SALTVERSION}}" - - listen: - - file: mine_functions -{% if INSTALLEDSALTVERSION|string == SALTVERSION|string %} - - file: set_log_levels -{% endif %} -{% if GLOBALS.role in GLOBALS.manager_roles %} - - file: /etc/salt/minion.d/signing_policies.conf -{% endif %} - - order: last diff --git a/salt/salt/minion/service_file.sls b/salt/salt/minion/service_file.sls new file mode 100644 index 000000000..8aded2d60 --- /dev/null +++ b/salt/salt/minion/service_file.sls @@ -0,0 +1,26 @@ +# 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. + +{% from 'salt/map.jinja' import SALTVERSION %} +{% from 'salt/map.jinja' import INSTALLEDSALTVERSION %} +{% from 'salt/map.jinja' import SYSTEMD_UNIT_FILE %} + +include: + - systemd.reload + +{% if INSTALLEDSALTVERSION|string == SALTVERSION|string %} + +# prior to 2.4.30 this managed file would restart the salt-minion service when updated +# since this file is currently only adding a delay service start +# it is not required to restart the service +salt_minion_service_unit_file: + file.managed: + - name: {{ SYSTEMD_UNIT_FILE }} + - source: salt://salt/service/salt-minion.service.jinja + - template: jinja + - onchanges_in: + - module: systemd_reload + +{% endif %} From 14ddbd32add8dab355c253a9aa3f31544979f5d6 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Mon, 22 Sep 2025 16:38:40 -0400 Subject: [PATCH 2/8] salt-minion service file changes for hypervisor and managerhype --- salt/libvirt/bridge.sls | 4 -- salt/salt/minion/init.sls | 117 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 4 deletions(-) create mode 100644 salt/salt/minion/init.sls diff --git a/salt/libvirt/bridge.sls b/salt/libvirt/bridge.sls index ed405584e..bd76f8ef4 100644 --- a/salt/libvirt/bridge.sls +++ b/salt/libvirt/bridge.sls @@ -35,13 +35,9 @@ wait_for_br0_ip: - file: salt_minion_service_unit_file - file: mine_functions -{% if grains.role in ['so-hypervisor', 'so-managerhype'] %} - restart_salt_minion_service: service.running: - name: salt-minion - enable: True - listen: - file: mine_functions - -{% endif %} diff --git a/salt/salt/minion/init.sls b/salt/salt/minion/init.sls new file mode 100644 index 000000000..374e6954c --- /dev/null +++ b/salt/salt/minion/init.sls @@ -0,0 +1,117 @@ +# 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. + +{% from 'vars/globals.map.jinja' import GLOBALS %} +{% from 'salt/map.jinja' import UPGRADECOMMAND with context %} +{% from 'salt/map.jinja' import SALTVERSION %} +{% from 'salt/map.jinja' import INSTALLEDSALTVERSION %} +{% from 'salt/map.jinja' import SALTPACKAGES %} +{% import_yaml 'salt/minion.defaults.yaml' as SALTMINION %} + +include: + - salt.python_modules + - salt.patch.x509_v2 + - salt + - repo.client + - salt.mine_functions + - salt.minion.service_file +{% if GLOBALS.role in GLOBALS.manager_roles %} + - ca +{% endif %} + +{% if INSTALLEDSALTVERSION|string != SALTVERSION|string %} + +{# this is added in 2.4.120 to remove salt repo files pointing to saltproject.io to accomodate the move to broadcom and new bootstrap-salt script #} +{% if salt['pkg.version_cmp'](GLOBALS.so_version, '2.4.120') == -1 %} +{% set saltrepofile = '/etc/yum.repos.d/salt.repo' %} +{% if grains.os_family == 'Debian' %} +{% set saltrepofile = '/etc/apt/sources.list.d/salt.list' %} +{% endif %} +remove_saltproject_io_repo_minion: + file.absent: + - name: {{ saltrepofile }} +{% endif %} + +unhold_salt_packages: + pkg.unheld: + - pkgs: +{% for package in SALTPACKAGES %} + - {{ package }} +{% endfor %} + +install_salt_minion: + cmd.run: + - name: /bin/sh -c '{{ UPGRADECOMMAND }}' + +# minion service is in failed state after upgrade. this command will start it after the state run for the upgrade completes +start_minion_post_upgrade: + cmd.run: + - name: | + exec 0>&- # close stdin + exec 1>&- # close stdout + exec 2>&- # close stderr + nohup /bin/sh -c 'sleep 30; systemctl start salt-minion' & + - require: + - cmd: install_salt_minion + - watch: + - cmd: install_salt_minion + - order: last + +{% endif %} + +{% if INSTALLEDSALTVERSION|string == SALTVERSION|string %} + +{% for package in SALTPACKAGES %} +# only hold the package if it is already installed +{% if salt['pkg.version'](package) %} +hold_{{ package }}_package: + pkg.held: + - name: {{ package }} + - version: {{SALTVERSION}}-0.* +{% endif %} +{% endfor %} + +remove_error_log_level_logfile: + file.line: + - name: /etc/salt/minion + - match: "log_level_logfile: error" + - mode: delete + +remove_error_log_level: + file.line: + - name: /etc/salt/minion + - match: "log_level: error" + - mode: delete + +set_log_levels: + file.append: + - name: /etc/salt/minion + - text: + - "log_level: info" + - "log_level_logfile: info" + +enable_startup_states: + file.uncomment: + - name: /etc/salt/minion + - regex: '^startup_states: highstate$' + - unless: pgrep so-setup + +{% endif %} + +# this has to be outside the if statement above since there are _in calls to this state +salt_minion_service: + service.running: + - name: salt-minion + - enable: True + - onlyif: test "{{INSTALLEDSALTVERSION}}" == "{{SALTVERSION}}" + - listen: + - file: mine_functions +{% if INSTALLEDSALTVERSION|string == SALTVERSION|string %} + - file: set_log_levels +{% endif %} +{% if GLOBALS.role in GLOBALS.manager_roles %} + - file: /etc/salt/minion.d/signing_policies.conf +{% endif %} + - order: last From 4587301cca382501eae464943c72b1dacde84170 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Tue, 23 Sep 2025 15:56:00 -0400 Subject: [PATCH 3/8] only update mine for managerhype during setup --- salt/libvirt/bridge.sls | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/salt/libvirt/bridge.sls b/salt/libvirt/bridge.sls index bd76f8ef4..096616e2e 100644 --- a/salt/libvirt/bridge.sls +++ b/salt/libvirt/bridge.sls @@ -5,7 +5,11 @@ # We do not import GLOBALS in this state because it is called during setup include: +{# If we update the mine functions for the so-hypervisor node, then it will not be able to update the mine when the state run. #} +{# This state is called from so-functions during setup and the so-hypervisor node would not have an accepted minion key and therefore couldn't update mine #} +{% if grains.role == 'so-managerhype '%} - salt.mine_functions +{% endif %} - salt.minion.service_file down_original_mgmt_interface: @@ -33,11 +37,15 @@ wait_for_br0_ip: - cmd: down_original_mgmt_interface - onchanges_in: - file: salt_minion_service_unit_file +{% if grains.role == 'so-managerhype '%} - file: mine_functions +{% endif %} +{% if grains.role == 'so-managerhype '%} restart_salt_minion_service: service.running: - name: salt-minion - enable: True - listen: - file: mine_functions +{% endif %} From 3a87af805fffc3e508031b935b64b16317c6caa4 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Wed, 24 Sep 2025 15:19:46 -0400 Subject: [PATCH 4/8] update service file, use salt.minion state to update mine_functions --- salt/libvirt/bridge.sls | 12 +----------- setup/so-functions | 6 ++---- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/salt/libvirt/bridge.sls b/salt/libvirt/bridge.sls index 096616e2e..9e8c59f90 100644 --- a/salt/libvirt/bridge.sls +++ b/salt/libvirt/bridge.sls @@ -5,11 +5,6 @@ # We do not import GLOBALS in this state because it is called during setup include: -{# If we update the mine functions for the so-hypervisor node, then it will not be able to update the mine when the state run. #} -{# This state is called from so-functions during setup and the so-hypervisor node would not have an accepted minion key and therefore couldn't update mine #} -{% if grains.role == 'so-managerhype '%} - - salt.mine_functions -{% endif %} - salt.minion.service_file down_original_mgmt_interface: @@ -37,15 +32,10 @@ wait_for_br0_ip: - cmd: down_original_mgmt_interface - onchanges_in: - file: salt_minion_service_unit_file -{% if grains.role == 'so-managerhype '%} - - file: mine_functions -{% endif %} -{% if grains.role == 'so-managerhype '%} restart_salt_minion_service: service.running: - name: salt-minion - enable: True - listen: - - file: mine_functions -{% endif %} + - file: salt_minion_service_unit_file diff --git a/setup/so-functions b/setup/so-functions index 9ab11a904..4434dc908 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1194,10 +1194,8 @@ hypervisor_local_states() { info "Running libvirt states for hypervisor" logCmd "salt-call state.apply libvirt.64962 --local --file-root=../salt/ -l info queue=True" info "Setting up bridge for $MNIC" - salt-call state.apply libvirt.bridge --local --file-root=../salt/ -l info pillar='{"host": {"mainint": "'$MNIC'"}}' queue=True - if [ $is_managerhype ]; then - logCmd "salt-call state.apply salt.minion queue=True" - fi + 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" fi } From c836dd2acd43aebb95c9fe52f06880072dbeb700 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Wed, 24 Sep 2025 16:50:29 -0400 Subject: [PATCH 5/8] set interface for network.ip_addrs for hypervisors --- salt/libvirt/bridge.sls | 3 +++ salt/salt/map.jinja | 2 +- setup/so-functions | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/salt/libvirt/bridge.sls b/salt/libvirt/bridge.sls index 9e8c59f90..cc28bd8b7 100644 --- a/salt/libvirt/bridge.sls +++ b/salt/libvirt/bridge.sls @@ -6,6 +6,7 @@ # We do not import GLOBALS in this state because it is called during setup include: - salt.minion.service_file + - salt.mine_functions down_original_mgmt_interface: cmd.run: @@ -32,6 +33,7 @@ wait_for_br0_ip: - cmd: down_original_mgmt_interface - onchanges_in: - file: salt_minion_service_unit_file + - file: mine_functions restart_salt_minion_service: service.running: @@ -39,3 +41,4 @@ restart_salt_minion_service: - enable: True - listen: - file: salt_minion_service_unit_file + - file: mine_functions diff --git a/salt/salt/map.jinja b/salt/salt/map.jinja index 1e3b200f4..81baa100a 100644 --- a/salt/salt/map.jinja +++ b/salt/salt/map.jinja @@ -4,7 +4,7 @@ Elastic License 2.0. #} {% 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' %} {% else %} {% set interface = pillar.host.mainint %} diff --git a/setup/so-functions b/setup/so-functions index 4434dc908..00f2e46c1 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1195,7 +1195,9 @@ hypervisor_local_states() { logCmd "salt-call state.apply libvirt.64962 --local --file-root=../salt/ -l info queue=True" info "Setting up bridge for $MNIC" 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 } From 1fb558cc7764d2952d9cfa3ef5f81eeabe8c52b3 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Thu, 25 Sep 2025 16:06:25 -0400 Subject: [PATCH 6/8] managerhype br0 setup --- salt/salt/map.jinja | 5 ++++- setup/so-functions | 17 ++++++++++++----- setup/so-setup | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/salt/salt/map.jinja b/salt/salt/map.jinja index 81baa100a..62b7f1b18 100644 --- a/salt/salt/map.jinja +++ b/salt/salt/map.jinja @@ -4,7 +4,10 @@ Elastic License 2.0. #} {% set role = salt['grains.get']('role', '') %} -{% if role in ['so-hypervisor','so-managerhype'] %} +{# We are using usebr0 mostly for setup of the so-managerhype node and controlling when we use br0 vs the physical interface #} +{% set usebr0 = salt['pillar.get']('usebr0', True) %} + +{% if role in ['so-hypervisor','so-managerhype'] and usebr0 %} {% set interface = 'br0' %} {% else %} {% set interface = pillar.host.mainint %} diff --git a/setup/so-functions b/setup/so-functions index 00f2e46c1..0d7890d17 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -541,8 +541,15 @@ configure_minion() { "log_file: /opt/so/log/salt/minion"\ "#startup_states: highstate" >> "$minion_config" - info "Running: salt-call state.apply salt.mine_functions --local --file-root=../salt/ -l info pillar='{"host": {"mainint": "$MNIC"}}'" - salt-call state.apply salt.mine_functions --local --file-root=../salt/ -l info pillar="{'host': {'mainint': $MNIC}}" + # At the time the so-managerhype node does not yet have the bridge configured. + # The so-hypervisor node doesn't either, but it doesn't cause issues here. + local usebr0=false + if [ "$minion_type" == 'hypervisor' ]; then + usebr0=true + fi + local pillar_json="{\"host\": {\"mainint\": \"$MNIC\"}, \"usebr0\": $usebr0}" + info "Running: salt-call state.apply salt.mine_functions --local --file-root=../salt/ -l info pillar='$pillar_json'" + salt-call state.apply salt.mine_functions --local --file-root=../salt/ -l info pillar="$pillar_json" { logCmd "systemctl enable salt-minion"; @@ -1195,9 +1202,9 @@ hypervisor_local_states() { logCmd "salt-call state.apply libvirt.64962 --local --file-root=../salt/ -l info queue=True" info "Setting up bridge for $MNIC" salt-call state.apply libvirt.bridge --local --file-root=../salt/ -l info pillar='{"host": {"mainint": "'$MNIC'"}}' queue=True - if [ $is_managerhype ]; then - logCmd "salt-call state.apply salt.minion queue=True" - fi + #if [ $is_managerhype ]; then + # logCmd "salt-call state.apply salt.minion queue=True" + #fi fi } diff --git a/setup/so-setup b/setup/so-setup index 347a7165c..ab055fd2d 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -762,6 +762,7 @@ if ! [[ -f $install_opt_file ]]; then fi logCmd "salt-call state.apply common.packages" logCmd "salt-call state.apply common" + hypervisor_local_states # this will apply the salt.minion state first since salt.master includes salt.minion logCmd "salt-call state.apply salt.master" # wait here until we get a response from the salt-master since it may have just restarted @@ -826,7 +827,6 @@ if ! [[ -f $install_opt_file ]]; then checkin_at_boot set_initial_firewall_access logCmd "salt-call schedule.enable -linfo --local" - hypervisor_local_states verify_setup else touch /root/accept_changes From e7752994804bee1f8eb9ba3d9094f1c73832f4b9 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Fri, 26 Sep 2025 15:43:49 -0400 Subject: [PATCH 7/8] so-user target minions with pillar elasticsearch:enabled:true --- salt/manager/tools/sbin/so-user | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/manager/tools/sbin/so-user b/salt/manager/tools/sbin/so-user index 92b3ba385..060dcf3a4 100755 --- a/salt/manager/tools/sbin/so-user +++ b/salt/manager/tools/sbin/so-user @@ -387,7 +387,7 @@ function syncElastic() { if [[ -z "$SKIP_STATE_APPLY" ]]; then echo "Elastic state will be re-applied to affected minions. This will run in the background and may take several minutes to complete." echo "Applying elastic state to elastic minions at $(date)" >> /opt/so/log/soc/sync.log 2>&1 - salt --async -C 'G@role:so-standalone or G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managersearch or G@role:so-searchnode or G@role:so-heavynode' state.apply elasticsearch queue=True >> /opt/so/log/soc/sync.log 2>&1 + salt --async -C 'I@elasticsearch:enabled:true' state.apply elasticsearch queue=True >> /opt/so/log/soc/sync.log 2>&1 fi else echo "Newly generated users/roles files are incomplete; aborting." From c8814d06326341c93e28cffcbbb779ce5dbcd3cb Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Mon, 29 Sep 2025 16:58:45 -0400 Subject: [PATCH 8/8] removed commented code --- setup/so-functions | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 0d7890d17..5847df704 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1202,9 +1202,6 @@ hypervisor_local_states() { logCmd "salt-call state.apply libvirt.64962 --local --file-root=../salt/ -l info queue=True" info "Setting up bridge for $MNIC" salt-call state.apply libvirt.bridge --local --file-root=../salt/ -l info pillar='{"host": {"mainint": "'$MNIC'"}}' queue=True - #if [ $is_managerhype ]; then - # logCmd "salt-call state.apply salt.minion queue=True" - #fi fi }