container: Allow custom ip addresses for more than one network

roles/container/defaults/main.yaml

@@ -7,7 +7,6 @@ container_devices: []
 container_publish_ports: []
 container_networks: []
 container_hostname: ""
-container_ip: ""
 container_secrets: []
 container_env: {}
 container_auto_start: true

roles/container/meta/argument_specs.yaml

@@ -118,17 +118,22 @@ argument_specs:
         type: list
         required: false
         default: []
-        elements: str
+        elements: dict
+        options:
+          name:
+            description: Network name
+            type: str
+            required: true
+          ip:
+            description: Container IPv4 address in the network
+            type: str
+            required: false
+            default: ""
       container_hostname:
         description: Hostname to set inside the container. Available to other containers on the same network.
         type: str
         required: false
         default: ""
-      container_ip:
-        description: IPv4 address for the container in the first network defined in container_networks
-        type: str
-        required: false
-        default: ""
 
       container_secrets:
         description: A list of secrets available to the container as file or environment variable

roles/container/tasks/main.yaml

@@ -13,14 +13,13 @@
   ansible.builtin.include_role:
     name: network
   vars:
-    network_name: "{{ network }}"
-    network_subnet: "{{ _container_network_subnet if network_index == 0 else '' }}"
-    network_range: "{{ _container_network_range if network_index == 0 else '' }}"
-  when: network_created_networks is not defined or network not in network_created_networks
+    network_name: "{{ network.name }}"
+    network_subnet: "{{ _container_network_subnet }}"
+    network_range: "{{ _container_network_range }}"
+  when: network_created_networks is not defined or network.name not in network_created_networks
   loop: "{{ container_networks }}"
   loop_control:
     loop_var: network
-    index_var: network_index
 
 - name: Create volumes for container {{ container_name }}
   ansible.builtin.include_role:
@@ -49,7 +48,7 @@
     user: "{{ container_user or omit }}"
     mount: "{{ _container_mounts | map('items') | map('map', 'join', '=') | map('join', ',') }}"
     device: "{{ _container_devices }}"
-    network: "{{ _container_networks_with_ip }}"
+    network: "{{ _container_networks }}"
     hostname: "{{ container_hostname or omit }}"
     publish: "{{ container_publish_ports }}"
     secrets: "{{ _container_secrets }}"

roles/container/vars/main/general.yaml

@@ -1,33 +1,6 @@
 ---
 _container_image: "{{ container_image | replace('/', '_') ~ '.image' }}"
 
-_container_networks: "{{ container_networks | map('regex_replace', '$', '.network') }}"
-_container_networks_with_ip: >-
-  {{
-    [
-      _container_networks[0] ~ (
-        ':ip=' ~ container_ip if container_ip | length > 0 else ''
-      )
-    ]
-    + _container_networks[1:]
-  }}
-_container_network_subnet: >-
-  {{ container_ip | ansible.utils.ipsubnet(24) if container_ip | length > 0 else '' }}
-_container_network_subnet_ranges: >-
-  {{
-    [
-      _container_network_subnet | ansible.utils.ipsubnet(25, 0),
-      _container_network_subnet | ansible.utils.ipsubnet(25, 1)
-    ] if container_ip | length > 0 else ''
-  }}
-_container_network_range: >-
-  {{
-    _container_network_subnet_ranges |
-      reject('ansible.utils.supernet_of', container_ip) |
-      first
-    if container_ip | length > 0 else ''
-  }}
-
 _container_volumes: "{{ container_mounts | selectattr('type', '==', 'volume') }}"
 
 _container_mount_sources: "{{ container_mounts | map(attribute='source') }}"

roles/container/vars/main/network.yaml

@@ -0,0 +1,27 @@
+---
+_container_networks: >-
+  {{
+    container_networks
+    | map(attribute='name')
+    | map('regex_replace', '$', '.network')
+    | zip(container_networks | map(attribute='ip', default=''))
+    | map('reject', 'equalto', '')
+    | map('join', ':ip=')
+  }}
+
+_container_network_subnet: >-
+  {{ network.ip | ansible.utils.ipsubnet(24) if network.ip | default('') | length > 0 else '' }}
+_container_network_subnet_ranges: >-
+  {{
+    [
+      _container_network_subnet | ansible.utils.ipsubnet(25, 0),
+      _container_network_subnet | ansible.utils.ipsubnet(25, 1)
+    ] if network.ip | default('') | length > 0 else []
+  }}
+_container_network_range: >-
+  {{
+    _container_network_subnet_ranges |
+      reject('ansible.utils.supernet_of', network.ip) |
+      first
+    if network.ip | default('') | length > 0 else ''
+  }}