ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2025-12-16 20:08:41 +00:00
Code Packages Projects Releases Wiki Activity

put example addresses in actual RFC1918 range (#170)

Browse Source 
172.1/16, 172.3/16 and 172.4/16 are not in the 172.16/12 range.

https://datatracker.ietf.org/doc/html/rfc1918#section-3
This commit is contained in:
Lauri Tirkkonen 2021-07-01 20:06:18 +03:00 committed by GitHub
parent 61d9237eef
commit a0f2091e6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/modules/docker_container.py
View File

@ -981,7 +981,7 @@ EXAMPLES = '''
image: ubuntu:14.04 image: ubuntu:14.04
networks: networks:
- name: TestingNet - name: TestingNet
ipv4_address: "172.1.1.100" ipv4_address: "172.16.1.100"
aliases: aliases:
- sleepyzz - sleepyzz
links: links:
@ -999,11 +999,11 @@ EXAMPLES = '''
name: sleepy name: sleepy
networks: networks:
- name: TestingNet - name: TestingNet
ipv4_address: 172.1.1.18 ipv4_address: 172.16.1.18
links: links:
- sleeper - sleeper
- name: TestingNet2 - name: TestingNet2
ipv4_address: 172.1.10.20 ipv4_address: 172.16.10.20
- name: Update network with aliases - name: Update network with aliases
community.docker.docker_container: community.docker.docker_container:

12
plugins/modules/docker_network.py
View File

@ -204,12 +204,12 @@ EXAMPLES = '''
community.docker.docker_network: community.docker.docker_network:
name: network_three name: network_three
ipam_config: ipam_config:
- subnet: 172.3.27.0/24 - subnet: 172.23.27.0/24
gateway: 172.3.27.2 gateway: 172.23.27.2
iprange: 172.3.27.0/26 iprange: 172.23.27.0/26
aux_addresses: aux_addresses:
host1: 172.3.27.3 host1: 172.23.27.3
host2: 172.3.27.4 host2: 172.23.27.4
- name: Create a network with labels - name: Create a network with labels
community.docker.docker_network: community.docker.docker_network:
@ -230,7 +230,7 @@ EXAMPLES = '''
name: network_ipv6_two name: network_ipv6_two
enable_ipv6: yes enable_ipv6: yes
ipam_config: ipam_config:
- subnet: 172.4.27.0/24 - subnet: 172.24.27.0/24
- subnet: fdd1:ac8c:0557:7ce2::/64 - subnet: fdd1:ac8c:0557:7ce2::/64
- name: Delete a network, disconnecting all containers - name: Delete a network, disconnecting all containers

50
tests/integration/targets/docker_network/tasks/tests/ipam.yml
View File

@ -17,12 +17,12 @@
docker_network: docker_network:
name: "{{ nname_ipam_1 }}" name: "{{ nname_ipam_1 }}"
ipam_config: ipam_config:
- subnet: 172.3.27.0/24 - subnet: 172.23.27.0/24
gateway: 172.3.27.2 gateway: 172.23.27.2
iprange: 172.3.27.0/26 iprange: 172.23.27.0/26
aux_addresses: aux_addresses:
host1: 172.3.27.3 host1: 172.23.27.3
host2: 172.3.27.4 host2: 172.23.27.4
register: network register: network
- assert: - assert:
@ -33,12 +33,12 @@
docker_network: docker_network:
name: "{{ nname_ipam_1 }}" name: "{{ nname_ipam_1 }}"
ipam_config: ipam_config:
- subnet: 172.3.27.0/24 - subnet: 172.23.27.0/24
gateway: 172.3.27.2 gateway: 172.23.27.2
iprange: 172.3.27.0/26 iprange: 172.23.27.0/26
aux_addresses: aux_addresses:
host1: 172.3.27.3 host1: 172.23.27.3
host2: 172.3.27.4 host2: 172.23.27.4
register: network register: network
- assert: - assert:
@ -49,11 +49,11 @@
docker_network: docker_network:
name: "{{ nname_ipam_1 }}" name: "{{ nname_ipam_1 }}"
ipam_config: ipam_config:
- subnet: 172.3.28.0/24 - subnet: 172.23.28.0/24
gateway: 172.3.28.2 gateway: 172.23.28.2
iprange: 172.3.28.0/26 iprange: 172.23.28.0/26
aux_addresses: aux_addresses:
host1: 172.3.28.3 host1: 172.23.28.3
register: network register: network
diff: yes diff: yes
@ -70,7 +70,7 @@
docker_network: docker_network:
name: "{{ nname_ipam_1 }}" name: "{{ nname_ipam_1 }}"
ipam_config: ipam_config:
- subnet: 172.3.28.0/24 - subnet: 172.23.28.0/24
register: network register: network
- assert: - assert:
@ -151,7 +151,7 @@
name: "{{ nname_ipam_3 }}" name: "{{ nname_ipam_3 }}"
enable_ipv6: yes enable_ipv6: yes
ipam_config: ipam_config:
- subnet: 172.4.27.0/24 - subnet: 172.24.27.0/24
- subnet: fdd1:ac8c:0557:7ce2::/64 - subnet: fdd1:ac8c:0557:7ce2::/64
register: network register: network
@ -165,7 +165,7 @@
enable_ipv6: yes enable_ipv6: yes
ipam_config: ipam_config:
- subnet: fdd1:ac8c:0557:7ce2::/64 - subnet: fdd1:ac8c:0557:7ce2::/64
- subnet: 172.4.27.0/24 - subnet: 172.24.27.0/24
register: network register: network
- assert: - assert:
@ -177,7 +177,7 @@
name: "{{ nname_ipam_3 }}" name: "{{ nname_ipam_3 }}"
enable_ipv6: no enable_ipv6: no
ipam_config: ipam_config:
- subnet: 172.4.27.0/24 - subnet: 172.24.27.0/24
register: network register: network
diff: yes diff: yes
@ -203,8 +203,8 @@
driver_options: driver_options:
parent: "{{ ansible_default_ipv4.alias }}" parent: "{{ ansible_default_ipv4.alias }}"
ipam_config: ipam_config:
- subnet: 172.4.27.0/24 - subnet: 172.24.27.0/24
- subnet: 172.4.28.0/24 - subnet: 172.24.28.0/24
register: network register: network
- assert: - assert:
@ -218,8 +218,8 @@
driver_options: driver_options:
parent: "{{ ansible_default_ipv4.alias }}" parent: "{{ ansible_default_ipv4.alias }}"
ipam_config: ipam_config:
- subnet: 172.4.28.0/24 - subnet: 172.24.28.0/24
- subnet: 172.4.27.0/24 - subnet: 172.24.27.0/24
register: network register: network
- assert: - assert:
@ -233,8 +233,8 @@
driver_options: driver_options:
parent: "{{ ansible_default_ipv4.alias }}" parent: "{{ ansible_default_ipv4.alias }}"
ipam_config: ipam_config:
- subnet: 172.4.27.0/24 - subnet: 172.24.27.0/24
- subnet: 172.4.29.0/24 - subnet: 172.24.29.0/24
register: network register: network
diff: yes diff: yes
@ -250,7 +250,7 @@
driver_options: driver_options:
parent: "{{ ansible_default_ipv4.alias }}" parent: "{{ ansible_default_ipv4.alias }}"
ipam_config: ipam_config:
- subnet: 172.4.29.0/24 - subnet: 172.24.29.0/24
register: network register: network
- assert: - assert: