From b3a66ef3d4f360b4dce14e9051dc32861ef44018 Mon Sep 17 00:00:00 2001 From: leiyashuai Date: Mon, 12 Sep 2022 15:56:04 +0800 Subject: Remove "distutils" library Library "distutils" is deprecated in Python 3.10: https://peps.python.org/pep-0632/ The versions previously referenced using StrictVersion should be old enough that they will not be used in a Dalmatian deployment: - Ansible 2.11 - Docker API 1.42, included since Docker engine 23.0.0 Change-Id: Ie315004715a1cb5a91dd54bc64b0a8fd0af650ec --- ansible/module_utils/kolla_container_worker.py | 3 --- ansible/module_utils/kolla_docker_worker.py | 22 +++++++--------------- 2 files changed, 7 insertions(+), 18 deletions(-) (limited to 'ansible/module_utils') diff --git a/ansible/module_utils/kolla_container_worker.py b/ansible/module_utils/kolla_container_worker.py index 4895820c6..7fdf54175 100644 --- a/ansible/module_utils/kolla_container_worker.py +++ b/ansible/module_utils/kolla_container_worker.py @@ -28,7 +28,6 @@ class ContainerWorker(ABC): self.changed = False # Use this to store arguments to pass to exit_json(). self.result = {} - self._cgroupns_mode_supported = True self.systemd = SystemdWorker(self.params) @@ -141,8 +140,6 @@ class ContainerWorker(ABC): pass def compare_cgroupns_mode(self, container_info): - if not self._cgroupns_mode_supported: - return False new_cgroupns_mode = self.params.get('cgroupns_mode') if new_cgroupns_mode is None: # means we don't care what it is diff --git a/ansible/module_utils/kolla_docker_worker.py b/ansible/module_utils/kolla_docker_worker.py index 87beccb72..2daf13eab 100644 --- a/ansible/module_utils/kolla_docker_worker.py +++ b/ansible/module_utils/kolla_docker_worker.py @@ -19,8 +19,6 @@ import os from ansible.module_utils.kolla_container_worker import COMPARE_CONFIG_CMD from ansible.module_utils.kolla_container_worker import ContainerWorker -from distutils.version import StrictVersion - def get_docker_client(): return docker.APIClient @@ -38,13 +36,8 @@ class DockerWorker(ContainerWorker): self.dc = get_docker_client()(**options) - self._cgroupns_mode_supported = ( - StrictVersion(self.dc._version) >= StrictVersion('1.41')) - self._dimensions_kernel_memory_removed = ( - StrictVersion(self.dc._version) >= StrictVersion('1.42')) - - if self._dimensions_kernel_memory_removed: - self.dimension_map.pop('kernel_memory', None) + self._dimensions_kernel_memory_removed = True + self.dimension_map.pop('kernel_memory', None) def generate_tls(self): tls = {'verify': self.params.get('tls_verify')} @@ -304,12 +297,11 @@ class DockerWorker(ContainerWorker): host_config = self.dc.create_host_config(**options) - if self._cgroupns_mode_supported: - # NOTE(yoctozepto): python-docker does not support CgroupnsMode - # natively so we stuff it in manually. - cgroupns_mode = self.params.get('cgroupns_mode') - if cgroupns_mode is not None: - host_config['CgroupnsMode'] = cgroupns_mode + # NOTE(yoctozepto): python-docker does not support CgroupnsMode + # natively so we stuff it in manually. + cgroupns_mode = self.params.get('cgroupns_mode') + if cgroupns_mode is not None: + host_config['CgroupnsMode'] = cgroupns_mode # detached containers should only log to journald if self.params.get('detach'): -- cgit v1.2.3