prevent nodes with logstash:dmz:true from being added to logstash:nodes pillar

This commit is contained in:
m0duspwnens
2022-05-10 17:28:19 -04:00
parent b4aa59c619
commit a641346c02
2 changed files with 52 additions and 1 deletions

View File

@@ -2,7 +2,7 @@
{% set cached_grains = salt.saltutil.runner('cache.grains', tgt='*') %} {% set cached_grains = salt.saltutil.runner('cache.grains', tgt='*') %}
{% for minionid, ip in salt.saltutil.runner( {% for minionid, ip in salt.saltutil.runner(
'mine.get', 'mine.get',
tgt='G@role:so-manager or G@role:so-managersearch or G@role:so-standalone or G@role:so-node or G@role:so-heavynode or G@role:so-receiver or G@role:so-helix ', tgt='( G@role:so-manager or G@role:so-managersearch or G@role:so-standalone or G@role:so-node or G@role:so-heavynode or G@role:so-receiver or G@role:so-helix ) and ( not I@logstash:dmz:true or not I@logstash:dmz:True )',
fun='network.ip_addrs', fun='network.ip_addrs',
tgt_type='compound') | dictsort() tgt_type='compound') | dictsort()
%} %}

51
salt/podman/init.sls Normal file
View File

@@ -0,0 +1,51 @@
Pip pkg:
pkg.installed:
- name: python3-pip
Podman pkg:
pkg.installed:
- name: podman
Podman service:
file.managed:
- name: /usr/lib/systemd/system/podman.service
- source: salt://podman/podman.service
Podman socket:
file.managed:
- name: /usr/lib/systemd/system/podman.socket
- source: salt://podman/podman.socket
service.running:
- name: podman.socket
- enable: true
Docker socket:
file.symlink:
- name: /var/run/docker.sock
- target: /var/run/podman/podman.sock
Docker python:
pip.installed:
- bin_env: /usr/bin/pip3
- reload_modules: true
- pkgs:
- certifi==2019.11.28
- chardet==3.0.4
- docker==4.2.1
- idna==2.9
# - requests==2.23.0
- six==1.14.0
- urllib3==1.25.8
- websocket-client==0.57.0
podman_docker_symlink:
file.symlink:
- name: /bin/docker
- target: /usr/bin/podman
restart_salt_minion:
cmd.run:
- name: 'salt-call service.restart salt-minion'
- bg: true
- onchanges:
- pip: Docker python