internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 22:33:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ansible/modules/cloud/docker/docker_swarm.py
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))