Merge "Remove podman_version fact and conditional from undercloud-deploy"

roles/undercloud-deploy/tasks/main.yml

@@ -4,26 +4,6 @@
     gather_subset: "!min,distribution"
   when: ansible_distribution is not defined
 
-- name: Run podman --version
-  command: podman --version
-  ignore_errors: true
-  register: podman_ver
-  tags:
-    - undercloud-install
-  changed_when: false
-
-
-- name: Set fact for podman version
-  set_fact:
-    podman_version: >-
-      {%- if podman_ver is success -%}
-      {{ podman_ver.stdout | replace("podman version ", "") }}
-      {%- else -%}0.0
-      {%- endif -%}
-  tags:
-    - undercloud-install
-
-
 - include: novajoin_prep.yml
   when: enable_tls_everywhere|bool and prepare_ipa|bool and undercloud_enable_novajoin|bool
   tags:

roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2

@@ -35,9 +35,7 @@ parameter_defaults:
     modify_vars:
       tasks_from: yum_update.yml
       yum_repos_dir_path: /etc/yum.repos.d
-{% if release not in ['pike','queens','stein'] and podman_version is version('1.5.0', '>=') %}
       yum_cache: /var/tmp/tripleo-container-image-prepare-cache
-{% endif %}
       update_repo: "{{ update_containers_repo }}"
 {% if  release not in ['newton', 'ocata', 'pike', 'queens'] %}
       container_build_tool: buildah