update fw for receiver and add mine_functions for ip_addr

This commit is contained in:
m0duspwnens
2021-12-10 15:28:40 -05:00
parent 54c32acdbf
commit fe7247f876
3 changed files with 13 additions and 2 deletions

View File

@@ -620,17 +620,16 @@ role:
search_node: search_node:
portgroups: portgroups:
- {{ portgroups.redis }} - {{ portgroups.redis }}
- {{ portgroups.minio }}
- {{ portgroups.elasticsearch_node }} - {{ portgroups.elasticsearch_node }}
- {{ portgroups.beats_5644 }} - {{ portgroups.beats_5644 }}
heavy_node: heavy_node:
portgroups: portgroups:
- {{ portgroups.redis }} - {{ portgroups.redis }}
- {{ portgroups.minio }}
- {{ portgroups.elasticsearch_node }} - {{ portgroups.elasticsearch_node }}
- {{ portgroups.beats_5644 }} - {{ portgroups.beats_5644 }}
self: self:
portgroups: portgroups:
- {{ portgroups.redis }}
- {{ portgroups.syslog}} - {{ portgroups.syslog}}
syslog: syslog:
portgroups: portgroups:

View File

@@ -0,0 +1,3 @@
mine_functions:
network.ip_addrs:
- interface: {{ pillar.host.mainint }}

View File

@@ -76,14 +76,23 @@ salt_minion_service_unit_file:
- module: systemd_reload - module: systemd_reload
- listen_in: - listen_in:
- service: salt_minion_service - service: salt_minion_service
{% endif %} {% endif %}
mine_functions:
file.managed:
- name: /etc/salt/minion.d/mine_functions.conf
- source: salt://salt/etc/mine_functions.conf
- template: jinja
# this has to be outside the if statement above since there are <requisite>_in calls to this state # this has to be outside the if statement above since there are <requisite>_in calls to this state
salt_minion_service: salt_minion_service:
service.running: service.running:
- name: salt-minion - name: salt-minion
- enable: True - enable: True
- onlyif: test "{{INSTALLEDSALTVERSION}}" == "{{SALTVERSION}}" - onlyif: test "{{INSTALLEDSALTVERSION}}" == "{{SALTVERSION}}"
- watch:
- file: mine_functions
patch_pkg: patch_pkg:
pkg.installed: pkg.installed: