diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2023-02-02 15:08:42 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-02-03 11:32:32 +0000 |
| commit | f253f99c1216705cc52e65f6229f8ae42bfda178 (patch) | |
| tree | 450c03c4344449168c76a572d9d0188eca1f5c3c /ansible/module_utils/kolla_docker_worker.py | |
| parent | 66ec9cef5557770acb2bd89a107535150af243ba (diff) | |
| download | kolla-ansible-f253f99c1216705cc52e65f6229f8ae42bfda178.tar.gz kolla-ansible-f253f99c1216705cc52e65f6229f8ae42bfda178.zip | |
Do not support dimensions:kernel_memory on Docker API 1.42
It is deprecated in 20.10 and removed in 23.0 (and 23.0 is out) [1], [2].
[1]: https://docs.docker.com/engine/deprecated/#kernel-memory-limit
[2]: https://docs.docker.com/engine/api/version-history/#v142-api-changes
Change-Id: Ia6fa85172aad7bcd5f958922d3c224ef79882e6c
Diffstat (limited to 'ansible/module_utils/kolla_docker_worker.py')
| -rw-r--r-- | ansible/module_utils/kolla_docker_worker.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ansible/module_utils/kolla_docker_worker.py b/ansible/module_utils/kolla_docker_worker.py index 8c365ca45..9ac6cff85 100644 --- a/ansible/module_utils/kolla_docker_worker.py +++ b/ansible/module_utils/kolla_docker_worker.py @@ -50,6 +50,8 @@ class DockerWorker(object): self._cgroupns_mode_supported = ( StrictVersion(self.dc._version) >= StrictVersion('1.41')) + self._dimensions_kernel_memory_removed = ( + StrictVersion(self.dc._version) >= StrictVersion('1.42')) self.systemd = SystemdWorker(self.params) @@ -310,8 +312,11 @@ class DockerWorker(object): 'memswap_limit': 'MemorySwap', 'cpu_period': 'CpuPeriod', 'cpu_quota': 'CpuQuota', 'cpu_shares': 'CpuShares', 'cpuset_cpus': 'CpusetCpus', 'cpuset_mems': 'CpusetMems', - 'kernel_memory': 'KernelMemory', 'blkio_weight': 'BlkioWeight', - 'ulimits': 'Ulimits'} + 'blkio_weight': 'BlkioWeight', 'ulimits': 'Ulimits'} + + if not self._dimensions_kernel_memory_removed: + dimension_map['kernel_memory'] = 'KernelMemory' + unsupported = set(new_dimensions.keys()) - \ set(dimension_map.keys()) if unsupported: |