container: Allow custom ip addresses for more than one network
This commit is contained in:
@@ -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') }}"
|
||||
27
roles/container/vars/main/network.yaml
Normal file
27
roles/container/vars/main/network.yaml
Normal file
@@ -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 ''
|
||||
}}
|
||||
Reference in New Issue
Block a user