ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix advertise addr (#47608)

Browse source 
* Fix issue #46326

* Update example to create a default swarm
This commit is contained in:
Thierry Bouvet 2018-11-01 09:10:03 +01:00 committed by John R Barker
parent 65768b996d
commit 87de2dde9f
2 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/docker/docker_swarm.py
View file

@ -151,7 +151,6 @@ EXAMPLES = '''
- name: Init a new swarm with default parameters - name: Init a new swarm with default parameters
docker_swarm: docker_swarm:
state: present state: present
advertise_addr: 192.168.1.1
- name: Update swarm configuration - name: Update swarm configuration
docker_swarm: docker_swarm:
@ -330,9 +329,6 @@ class SwarmManager(DockerBaseClass):
return return
try: try:
if self.parameters.advertise_addr is None:
self.client.fail(msg="advertise_addr is required to initialize a swarm cluster.")
self.client.init_swarm( self.client.init_swarm(
advertise_addr=self.parameters.advertise_addr, listen_addr=self.parameters.listen_addr, advertise_addr=self.parameters.advertise_addr, listen_addr=self.parameters.listen_addr,
force_new_cluster=self.parameters.force_new_cluster, swarm_spec=self.parameters.spec) force_new_cluster=self.parameters.force_new_cluster, swarm_spec=self.parameters.spec)

13
test/integration/targets/docker_swarm/tasks/test_swarm.yml
View file

@ -3,18 +3,6 @@
state: absent state: absent
force: true force: true
- name: Test parameters with state=present
docker_swarm:
state: present
ignore_errors: yes
register: output
- name: assert failure when called with state=init and no advertise_addr
assert:
that:
- 'output.failed'
- 'output.msg == "advertise_addr is required to initialize a swarm cluster."'
- name: Test parameters with state=join - name: Test parameters with state=join
docker_swarm: docker_swarm:
state: join state: join
@ -42,7 +30,6 @@
- name: Create a Swarm cluster - name: Create a Swarm cluster
docker_swarm: docker_swarm:
state: present state: present
advertise_addr: "{{ansible_default_ipv4.address}}"
register: output register: output
- name: assert changed when create a new swarm cluster - name: assert changed when create a new swarm cluster