Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docker_container: improving idempotency #44808

Merged
merged 3 commits into from
Aug 30, 2018
Merged

docker_container: improving idempotency #44808

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a57d3c4
Only handle cpu_shares, volume_driver, auto_remove as in _host_config().
felixfontein Aug 29, 2018
a74a717
Don't compare log_options (resp restart_retries) if log_driver (resp …
felixfontein Aug 29, 2018
4b948b9
Warn that log_options (resp restart_retries) is ignored if log_driver…
felixfontein Aug 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 22 additions & 6 deletions lib/ansible/modules/cloud/docker/docker_container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1273,7 +1273,6 @@ def has_different_configuration(self, image):

# Map parameters to container inspect results
config_mapping = dict(
auto_remove=host_config.get('AutoRemove'),
expected_cmd=config.get('Cmd'),
domainname=config.get('Domainname'),
hostname=config.get('Hostname'),
Expand All @@ -1293,8 +1292,6 @@ def has_different_configuration(self, image):
ipc_mode=host_config.get("IpcMode"),
labels=config.get('Labels'),
expected_links=host_config.get('Links'),
log_driver=log_config.get('Type'),
log_options=log_config.get('Config'),
mac_address=network.get('MacAddress'),
memory_swappiness=host_config.get('MemorySwappiness'),
network_mode=host_config.get('NetworkMode'),
Expand All @@ -1306,7 +1303,6 @@ def has_different_configuration(self, image):
expected_ports=host_config.get('PortBindings'),
read_only=host_config.get('ReadonlyRootfs'),
restart_policy=restart_policy.get('Name'),
restart_retries=restart_policy.get('MaximumRetryCount'),
# Cannot test shm_size, as shm_size is not included in container inspection results.
# shm_size=host_config.get('ShmSize'),
security_opts=host_config.get("SecurityOpt"),
Expand All @@ -1319,9 +1315,21 @@ def has_different_configuration(self, image):
expected_volumes=config.get('Volumes'),
expected_binds=host_config.get('Binds'),
volumes_from=host_config.get('VolumesFrom'),
volume_driver=host_config.get('VolumeDriver'),
working_dir=config.get('WorkingDir')
)
if self.parameters.restart_policy:
config_mapping['restart_retries'] = restart_policy.get('MaximumRetryCount')
if self.parameters.log_driver:
config_mapping['log_driver'] = log_config.get('Type')
config_mapping['log_options'] = log_config.get('Config')

if self.parameters.client.HAS_AUTO_REMOVE_OPT:
# auto_remove is only supported in docker>=2
config_mapping['auto_remove'] = host_config.get('AutoRemove')

if HAS_DOCKER_PY_3:
# volume_driver moved to create_host_config in > 3
config_mapping['volume_driver'] = host_config.get('VolumeDriver')

differences = []
for key, value in config_mapping.items():
Expand Down Expand Up @@ -1419,7 +1427,6 @@ def has_different_resource_limits(self):
cpu_quota=host_config.get('CpuQuota'),
cpuset_cpus=host_config.get('CpusetCpus'),
cpuset_mems=host_config.get('CpusetMems'),
cpu_shares=host_config.get('CpuShares'),
kernel_memory=host_config.get("KernelMemory"),
memory=host_config.get('Memory'),
memory_reservation=host_config.get('MemoryReservation'),
Expand All @@ -1428,6 +1435,10 @@ def has_different_resource_limits(self):
oom_killer=host_config.get('OomKillDisable'),
)

if HAS_DOCKER_PY_3:
# cpu_shares moved to create_host_config in > 3
config_mapping['cpu_shares'] = host_config.get('CpuShares')

differences = []
for key, value in config_mapping.items():
if getattr(self.parameters, key, None) and getattr(self.parameters, key) != value:
Expand Down Expand Up @@ -1741,6 +1752,11 @@ def __init__(self, client):

super(ContainerManager, self).__init__()

if client.module.params.get('log_options') and not client.module.params.get('log_driver'):
client.module.warn('log_options is ignored when log_driver is not specified')
if client.module.params.get('restart_retries') and not client.module.params.get('restart_policy'):
client.module.warn('restart_retries is ignored when restart_policy is not specified')

self.client = client
self.parameters = TaskParameters(client)
self.check_mode = self.client.check_mode
Expand Down