mirror of
https://github.com/ansible-collections/community.docker.git
synced 2025-12-16 20:08:41 +00:00
(cherry picked from commit 1e24120014)
Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
parent
ce620cb0ff
commit
89deaf4189
@ -339,7 +339,7 @@ class ConfigManager(DockerBaseClass):
|
|||||||
data_changed = True
|
data_changed = True
|
||||||
else:
|
else:
|
||||||
if not self.force:
|
if not self.force:
|
||||||
self.client.module.warn("'ansible_key' label not found. Config will not be changed unless the force parameter is set to 'yes'")
|
self.client.module.warn("'ansible_key' label not found. Config will not be changed unless the force parameter is set to 'true'")
|
||||||
# template_driver has changed if it was set in the previous config
|
# template_driver has changed if it was set in the previous config
|
||||||
# and now it differs, or if it wasn't set but now it is.
|
# and now it differs, or if it wasn't set but now it is.
|
||||||
if attrs.get('Templating', {}).get('Name'):
|
if attrs.get('Templating', {}).get('Name'):
|
||||||
|
|||||||
@ -323,7 +323,7 @@ class SecretManager(DockerBaseClass):
|
|||||||
data_changed = True
|
data_changed = True
|
||||||
else:
|
else:
|
||||||
if not self.force:
|
if not self.force:
|
||||||
self.client.module.warn("'ansible_key' label not found. Secret will not be changed unless the force parameter is set to 'yes'")
|
self.client.module.warn("'ansible_key' label not found. Secret will not be changed unless the force parameter is set to 'true'")
|
||||||
labels_changed = not compare_generic(self.labels, attrs.get('Labels'), 'allow_more_present', 'dict')
|
labels_changed = not compare_generic(self.labels, attrs.get('Labels'), 'allow_more_present', 'dict')
|
||||||
if self.rolling_versions:
|
if self.rolling_versions:
|
||||||
self.version = self.get_version(secret)
|
self.version = self.get_version(secret)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user