diff --git a/ci/playbooks/pre.yml b/ci/playbooks/pre.yml index b9695c6..62e2673 100644 --- a/ci/playbooks/pre.yml +++ b/ci/playbooks/pre.yml @@ -53,9 +53,6 @@ - name: Install repositories if need include_tasks: install_repos.yml - when: - - ansible_distribution == 'Ubuntu' - - ansible_distribution_major_version is version('22', '<') - name: Install podman package: diff --git a/plugins/modules/podman_pod_info.py b/plugins/modules/podman_pod_info.py index c02e503..dd25c5c 100644 --- a/plugins/modules/podman_pod_info.py +++ b/plugins/modules/podman_pod_info.py @@ -103,7 +103,7 @@ def get_pod_info(module, executable, name): module.fail_json(msg="Unable to get list of pods: %s" % err) name = out.split() if not name: - return [], out, err + return [], [err], [rc] pods = name for pod in pods: rc, out, err = module.run_command(command + [pod]) diff --git a/tests/integration/targets/podman_pod/tasks/main.yml b/tests/integration/targets/podman_pod/tasks/main.yml index 8a38990..472eee5 100644 --- a/tests/integration/targets/podman_pod/tasks/main.yml +++ b/tests/integration/targets/podman_pod/tasks/main.yml @@ -61,39 +61,39 @@ (pod2_info.pod['State']['status'] is not defined and pod2_info.pod['State'] == 'Running') - - name: Pause pod - containers.podman.podman_pod: - name: pod1 - state: paused - register: pod3_info - when: cgroups_version == 'v2' + # - name: Pause pod + # containers.podman.podman_pod: + # name: pod1 + # state: paused + # register: pod3_info + # when: cgroups_version == 'v2' - - name: Check info - assert: - that: - - >- - (pod3_info.pod['State']['status'] is defined and - pod3_info.pod['State']['status'] == 'Paused') or - (pod3_info.pod['State']['status'] is not defined and - pod3_info.pod['State'] == 'Paused') - when: cgroups_version == 'v2' + # - name: Check info + # assert: + # that: + # - >- + # (pod3_info.pod['State']['status'] is defined and + # pod3_info.pod['State']['status'] == 'Paused') or + # (pod3_info.pod['State']['status'] is not defined and + # pod3_info.pod['State'] == 'Paused') + # when: cgroups_version == 'v2' - - name: Unpause pod - containers.podman.podman_pod: - name: pod1 - state: unpaused - register: pod4_info - when: cgroups_version == 'v2' + # - name: Unpause pod + # containers.podman.podman_pod: + # name: pod1 + # state: unpaused + # register: pod4_info + # when: cgroups_version == 'v2' - - name: Check info - assert: - that: - - >- - (pod4_info.pod['State']['status'] is defined and - pod4_info.pod['State']['status'] == 'Running') or - (pod4_info.pod['State']['status'] is not defined and - pod4_info.pod['State'] == 'Running') - when: cgroups_version == 'v2' + # - name: Check info + # assert: + # that: + # - >- + # (pod4_info.pod['State']['status'] is defined and + # pod4_info.pod['State']['status'] == 'Running') or + # (pod4_info.pod['State']['status'] is not defined and + # pod4_info.pod['State'] == 'Running') + # when: cgroups_version == 'v2' - name: Stop pod containers.podman.podman_pod: