From fefc7e461f90eddda1a3e7a5360690f84dbf2514 Mon Sep 17 00:00:00 2001 From: Sergey <6213510+sshnaidm@users.noreply.github.com> Date: Tue, 29 Mar 2022 14:15:16 +0300 Subject: [PATCH] Remove idempotency for log level (#404) Since Podman changes its defaults very often and it's impossible to track and identify every time what is current log level, let's remove idempotency for this parameter for now. Signed-off-by: Sagi Shnaidman --- .../podman/podman_container_lib.py | 17 ------- .../tasks/idem_all.yml | 51 ------------------- 2 files changed, 68 deletions(-) diff --git a/plugins/module_utils/podman/podman_container_lib.py b/plugins/module_utils/podman/podman_container_lib.py index a9b630a..8f2d683 100644 --- a/plugins/module_utils/podman/podman_container_lib.py +++ b/plugins/module_utils/podman/podman_container_lib.py @@ -966,23 +966,6 @@ class PodmanContainerDiff: after = before return self._diff_update_and_compare('log_driver', before, after) - def diffparam_log_level(self): - if 'exitcommand' in self.info: - excom = self.info.get('exitcommand', []) - elif 'createcommand' in self.info['config']: - excom = self.info['config'].get('createcommand', []) - else: - self._diff_update_and_compare('log_level', '', '') - if '--log-level' in excom: - before = excom[excom.index('--log-level') + 1].lower() - else: - if self.module.params['log_level'] is not None: - before = '' - else: - before = self.params['log_level'] - after = self.params['log_level'] - return self._diff_update_and_compare('log_level', before, after) - # Parameter has limited idempotency, unable to guess the default log_path def diffparam_log_opt(self): before, after = {}, {} diff --git a/tests/integration/targets/podman_container_idempotency/tasks/idem_all.yml b/tests/integration/targets/podman_container_idempotency/tasks/idem_all.yml index 9a6bee7..9600604 100644 --- a/tests/integration/targets/podman_container_idempotency/tasks/idem_all.yml +++ b/tests/integration/targets/podman_container_idempotency/tasks/idem_all.yml @@ -68,57 +68,6 @@ assert: that: test4 is changed -- name: Run container with log level - containers.podman.podman_container: - image: "{{ idem_image }}" - name: idempotency - state: present - log_level: debug - command: 1h - register: test5 - -- name: Check info with log level - assert: - that: test5 is changed - -- name: Run container with log level again - containers.podman.podman_container: - image: "{{ idem_image }}" - name: idempotency - state: present - log_level: debug - command: 1h - register: test6 - -- name: Check info with log level again - assert: - that: test6 is not changed - -- name: Run container with changed log level - containers.podman.podman_container: - image: "{{ idem_image }}" - name: idempotency - state: present - log_level: fatal - command: 1h - register: test7 - -- name: Check info with changed log level - assert: - that: test7 is changed - -- name: Run container with default log level - containers.podman.podman_container: - image: "{{ idem_image }}" - name: idempotency - state: present - command: 1h - register: test8 - -- name: Check info with default log level - assert: - that: test8 is changed - - name: Run container with log opt tag containers.podman.podman_container: image: "{{ idem_image }}"