From a385ad321b2c9ecddb7abbc7f612c7a44e8c2f41 Mon Sep 17 00:00:00 2001
From: Sam Doran <sdoran@redhat.com>
Date: Sun, 17 Nov 2019 12:45:10 -0500
Subject: [PATCH] Use newer version of podman on RHEL (#64934)

- Use same podman version for RHEL 7 and 8
- Pin to version 1.4
---
 test/integration/targets/setup_podman/defaults/main.yml | 1 +
 test/integration/targets/setup_podman/tasks/main.yml    | 7 ++++---
 test/integration/targets/setup_podman/vars/RedHat-7.yml | 1 -
 test/integration/targets/setup_podman/vars/RedHat-8.yml | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 test/integration/targets/setup_podman/defaults/main.yml
 delete mode 100644 test/integration/targets/setup_podman/vars/RedHat-7.yml
 delete mode 100644 test/integration/targets/setup_podman/vars/RedHat-8.yml

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 00000000000..be888279874
--- /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 3b027dba394..0cd9ca20c98 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 604a139979a..00000000000
--- 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 e21bfcb370e..00000000000
--- a/test/integration/targets/setup_podman/vars/RedHat-8.yml
+++ /dev/null
@@ -1 +0,0 @@
-podman_package: '@container-tools:1.0'