From 0eb6f366d0d09bded9af8435e375e07b0645d323 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 14 Nov 2018 01:05:47 +0000
Subject: [PATCH] Revert "Revert "(squash) disabling podman everywhere in
 gate""

Related-Bug: #1803232
This reverts commit 9989134abcd9bae00d9863203025c9963ba901b5.

Change-Id: Ia0b9ba83223ef2c83ff69999bd0b1c9894796d1b
---
 config/general_config/featureset010.yml | 7 +------
 config/general_config/featureset027.yml | 7 -------
 config/general_config/featureset050.yml | 7 -------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/config/general_config/featureset010.yml b/config/general_config/featureset010.yml
index 99c69eaac..9d661d811 100644
--- a/config/general_config/featureset010.yml
+++ b/config/general_config/featureset010.yml
@@ -94,9 +94,4 @@ undercloud_enable_tempest: >-
   false
   {%- endif -%}
 
-undercloud_container_cli: >-
-  {% if release in ['rocky'] -%}
-  docker
-  {%- else -%}
-  podman
-  {%- endif -%}
+
diff --git a/config/general_config/featureset027.yml b/config/general_config/featureset027.yml
index 941cbeab7..7485abe31 100644
--- a/config/general_config/featureset027.yml
+++ b/config/general_config/featureset027.yml
@@ -125,10 +125,3 @@ mistral_test_black_regex:
   - 'mistral_tempest_tests.tests.scenario.engine.actions.v2.test_ssh_actions.SSHActionsTestsV2.test_run_ssh_proxied_action'
   - 'mistral_tempest_tests.tests.scenario.engine.actions.v2.test_openstack_actions.OpenStackActionsTestsV2.test_swift_actions'
   - 'mistral_tempest_tests.tests.scenario.engine.actions.v2.test_multi_vim_authentication.MultiVimActionsTests.test_multi_vim_support_target_headers'
-
-undercloud_container_cli: >-
-  {% if release in ['rocky'] -%}
-  docker
-  {%- else -%}
-  podman
-  {%- endif -%}
diff --git a/config/general_config/featureset050.yml b/config/general_config/featureset050.yml
index 9b4673b2f..c6eb22251 100644
--- a/config/general_config/featureset050.yml
+++ b/config/general_config/featureset050.yml
@@ -24,10 +24,3 @@ run_tempest: false
 # configured public-vip and admin-vip.
 undercloud_generate_service_certificate: true
 undercloud_enable_swift_encryption: true
-
-undercloud_container_cli: >-
-  {% if release in ['rocky'] -%}
-  docker
-  {%- else -%}
-  podman
-  {%- endif -%}