Fix force when state==present. (#53003)

This commit is contained in:
Felix Fontein 2019-02-27 10:11:57 +01:00 committed by John R Barker
parent dec97381bc
commit 76e0e0080b
3 changed files with 29 additions and 5 deletions

View file

@ -0,0 +1,2 @@
bugfixes:
- "docker_swarm - the ``force`` option was ignored when ``state: present``."

View file

@ -255,7 +255,6 @@ class TaskParameters(DockerBaseClass):
self.advertise_addr = None
self.listen_addr = None
self.force_new_cluster = None
self.remote_addrs = None
self.join_token = None
@ -356,8 +355,8 @@ class TaskParameters(DockerBaseClass):
def compare_to_active(self, other, differences):
for k in self.__dict__:
if k in ('advertise_addr', 'listen_addr', 'force_new_cluster', 'remote_addrs',
'join_token', 'force', 'rotate_worker_token', 'rotate_manager_token', 'spec'):
if k in ('advertise_addr', 'listen_addr', 'remote_addrs', 'join_token',
'rotate_worker_token', 'rotate_manager_token', 'spec'):
continue
if self.__dict__[k] is None:
continue
@ -419,7 +418,7 @@ class SwarmManager(DockerBaseClass):
return
def init_swarm(self):
if self.client.check_if_swarm_manager():
if not self.force and self.client.check_if_swarm_manager():
self.__update_swarm()
return
@ -427,7 +426,7 @@ class SwarmManager(DockerBaseClass):
try:
self.client.init_swarm(
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.force, swarm_spec=self.parameters.spec)
except APIError as exc:
self.client.fail("Can not create a new Swarm Cluster: %s" % to_native(exc))

View file

@ -61,6 +61,23 @@
diff: yes
register: output_4
- name: Create a Swarm cluster (force re-create)
docker_swarm:
state: present
advertise_addr: "{{ansible_default_ipv4.address}}"
force: yes
diff: yes
register: output_5
- name: Create a Swarm cluster (force re-create, check mode)
docker_swarm:
state: present
advertise_addr: "{{ansible_default_ipv4.address}}"
force: yes
check_mode: yes
diff: yes
register: output_6
- name: assert changed when create a new swarm cluster
assert:
that:
@ -79,6 +96,12 @@
- 'output_4 is not changed'
- 'output_4.diff.before is defined'
- 'output_4.diff.after is defined'
- 'output_5 is changed'
- 'output_5.diff.before is defined'
- 'output_5.diff.after is defined'
- 'output_6 is changed'
- 'output_6.diff.before is defined'
- 'output_6.diff.after is defined'
####################################################################
## Removal #########################################################