diff options
| author | Sam Doran <sdoran@redhat.com> | 2019-11-17 12:45:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-17 12:45:10 -0500 |
| commit | a385ad321b2c9ecddb7abbc7f612c7a44e8c2f41 (patch) | |
| tree | 9bedae1bcd076fbe063bf1b117699fab9f375d55 | |
| parent | b04940d2567fa5c4779e3bb6073f7388e619bcd9 (diff) | |
| download | ansible-a385ad321b2c9ecddb7abbc7f612c7a44e8c2f41.tar.gz | |
Use newer version of podman on RHEL (#64934)
- Use same podman version for RHEL 7 and 8
- Pin to version 1.4
4 files changed, 5 insertions, 5 deletions
diff --git a/test/integration/targets/setup_podman/defaults/main.yml b/test/integration/targets/setup_podman/defaults/main.yml new file mode 100644 index 0000000000..be88827987 --- /dev/null +++ b/test/integration/targets/setup_podman/defaults/main.yml @@ -0,0 +1 @@ +podman_package: podman-1.4.* diff --git a/test/integration/targets/setup_podman/tasks/main.yml b/test/integration/targets/setup_podman/tasks/main.yml index 3b027dba39..0cd9ca20c9 100644 --- a/test/integration/targets/setup_podman/tasks/main.yml +++ b/test/integration/targets/setup_podman/tasks/main.yml @@ -1,7 +1,4 @@ - block: - - name: Include distribution specific variables - include_vars: "{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_major_version }}.yml" - - name: Enable extras repo command: "{{ repo_command[ansible_facts.distribution ~ ansible_facts.distribution_major_version] | default('echo') }}" @@ -10,6 +7,10 @@ name: "{{ podman_package }}" state: present when: ansible_facts.pkg_mgr in ['yum', 'dnf'] + + - name: Get podman version + command: podman --version + when: - ansible_facts.distribution == 'RedHat' - ansible_facts.virtualization_type != 'docker' diff --git a/test/integration/targets/setup_podman/vars/RedHat-7.yml b/test/integration/targets/setup_podman/vars/RedHat-7.yml deleted file mode 100644 index 604a139979..0000000000 --- a/test/integration/targets/setup_podman/vars/RedHat-7.yml +++ /dev/null @@ -1 +0,0 @@ -podman_package: podman-1.3.* diff --git a/test/integration/targets/setup_podman/vars/RedHat-8.yml b/test/integration/targets/setup_podman/vars/RedHat-8.yml deleted file mode 100644 index e21bfcb370..0000000000 --- a/test/integration/targets/setup_podman/vars/RedHat-8.yml +++ /dev/null @@ -1 +0,0 @@ -podman_package: '@container-tools:1.0' |