diff --git a/roles/service/vars/main/additional.yaml b/roles/service/vars/main/additional.yaml index e78e69e..da7db42 100644 --- a/roles/service/vars/main/additional.yaml +++ b/roles/service/vars/main/additional.yaml @@ -23,7 +23,6 @@ _service_additional_container_wants: >- _service_additional_container_networks: >- {{ [service_name] - + [_service_additional_container.name] + service_container_additional_networks + ( _service_additional_container_publish_socket_ports diff --git a/roles/service/vars/main/general.yaml b/roles/service/vars/main/general.yaml index 3f77e00..c923134 100644 --- a/roles/service/vars/main/general.yaml +++ b/roles/service/vars/main/general.yaml @@ -5,7 +5,6 @@ _service_container_networks: >- + service_container_additional_networks + ([service_name ~ '-socat'] if service_container_http_port > 0 else []) + (_service_container_publish_socket_ports | map(attribute='name') | map('regex_replace', '^', service_name ~ '-')) - + (_service_additional_containers | map(attribute='name')) }} _service_static_ip: "{{ service_container_ip | length > 0 }}"