diff --git a/pillar/logstash/nodes.sls b/pillar/logstash/nodes.sls index 18c4b39bf..92272e7d8 100644 --- a/pillar/logstash/nodes.sls +++ b/pillar/logstash/nodes.sls @@ -2,7 +2,7 @@ {% set cached_grains = salt.saltutil.runner('cache.grains', tgt='*') %} {% for minionid, ip in salt.saltutil.runner( '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', tgt_type='compound') | dictsort() %} diff --git a/salt/podman/init.sls b/salt/podman/init.sls new file mode 100644 index 000000000..f00a21074 --- /dev/null +++ b/salt/podman/init.sls @@ -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