From c35a3e122f6ab237eccf44d9acdb7f7d0735746d Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 3 Jan 2023 11:13:50 -0500 Subject: [PATCH] add ip to container.add containers to sosbridge --- salt/curator/init.sls | 2 ++ salt/docker/defaults.yaml | 4 ++++ salt/elastic-fleet-package-registry/init.sls | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/salt/curator/init.sls b/salt/curator/init.sls index 9671020e5..0015bd2eb 100644 --- a/salt/curator/init.sls +++ b/salt/curator/init.sls @@ -128,6 +128,8 @@ so-curator: - hostname: curator - name: so-curator - user: curator + - networks: + - sosbridge: [] - interactive: True - tty: True - binds: diff --git a/salt/docker/defaults.yaml b/salt/docker/defaults.yaml index 1a179e251..5c9487853 100644 --- a/salt/docker/defaults.yaml +++ b/salt/docker/defaults.yaml @@ -15,6 +15,10 @@ docker: ports: 9200: tcp 9300: tcp + 'so-elastic-fleet-package-registry': + final_octet: 40 + ports: + 8080: tcp 'so-filebeat': final_octet: 23 'so-grafana': diff --git a/salt/elastic-fleet-package-registry/init.sls b/salt/elastic-fleet-package-registry/init.sls index f14ad47c7..acb8bfb63 100644 --- a/salt/elastic-fleet-package-registry/init.sls +++ b/salt/elastic-fleet-package-registry/init.sls @@ -4,6 +4,7 @@ {% from 'allowed_states.map.jinja' import allowed_states %} {% if sls in allowed_states %} {% from 'vars/globals.map.jinja' import GLOBALS %} +{% from 'docker/docker.map.jinja' import DOCKER %} # Add Group elasticsagentprgroup: @@ -27,6 +28,9 @@ so-elastic-fleet-package-registry: - hostname: Fleet-package-reg-{{ GLOBALS.hostname }} - detach: True - user: 948 + - networks: + - sosbridge: + - ipv4_address: {{ DOCKER.containers['so-elastic-fleet-package-registry'].ip }} - extra_hosts: - {{ GLOBALS.hostname }}:{{ GLOBALS.node_ip }} - port_bindings: