Move *_container_cli settings to extras-common

Remove  *_container_cli settings out of
feature set file to single-source
the setting in tqe role extras-common.

Change-Id: I833348a18597c230fea4a01ab203569ffe5ef7a0
Depends-On: https://review.opendev.org/#/c/678881/

config/general_config/featureset001.yml

@@ -156,10 +156,3 @@ undercloud_enable_tempest: >-
   {%- endif -%}
 
 tempest_extra_config: {'compute_feature_enabled.config_drive': 'True'}
-
-undercloud_container_cli: >-
-  {% if release in ['rocky'] -%}
-  docker
-  {%- else -%}
-  podman
-  {%- endif -%}

config/general_config/featureset010.yml

@@ -111,14 +111,3 @@ undercloud_enable_tempest: >-
   {%- else -%}
   false
   {%- endif -%}
-
-undercloud_container_cli: >-
-  {% if release in ['rocky'] -%}
-  docker
-  {%- else -%}
-  podman
-  {%- endif -%}
-# the variable is only used in overcloud-deploy role
-# for stein and beyond, so it's safe to set it to podman,
-# as for stable branches the variable won't be used.
-overcloud_container_cli: podman

config/general_config/featureset020.yml

@@ -154,10 +154,3 @@ test_black_regex:
 test_ping: false
 # For full tempest run we need to make sure concurrency is not too high
 tempest_workers: 3
-
-undercloud_container_cli: >-
-  {% if release in ['rocky'] -%}
-  docker
-  {%- else -%}
-  podman
-  {%- endif -%}

config/general_config/featureset021.yml

@@ -179,10 +179,3 @@ tempest_workers: 3
 
 # Install the latest unlreleased packages from CentOS
 enable_centos_cr_repo: true
-
-undercloud_container_cli: >-
-  {% if release in ['rocky'] -%}
-  docker
-  {%- else -%}
-  podman
-  {%- endif -%}

config/general_config/featureset027.yml

@@ -127,10 +127,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 -%}

config/general_config/featureset035.yml

@@ -135,10 +135,3 @@ run_tempest: true
 test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
-
-undercloud_container_cli: >-
-  {% if release in ['rocky'] -%}
-  docker
-  {%- else -%}
-  podman
-  {%- endif -%}

config/general_config/featureset039.yml

@@ -153,13 +153,6 @@ undercloud_enable_tempest: >-
   false
   {%- endif -%}
 
-undercloud_container_cli: >-
-  {% if release in ['rocky'] -%}
-  docker
-  {%- else -%}
-  podman
-  {%- endif -%}
-
 # TLS everywhere related vars. #
 enable_tls_everywhere: true
 novajoin_connect_timeout: 60

config/general_config/featureset043.yml

@@ -153,13 +153,6 @@ undercloud_enable_tempest: >-
   false
   {%- endif -%}
 
-undercloud_container_cli: >-
-  {% if release in ['rocky'] -%}
-  docker
-  {%- else -%}
-  podman
-  {%- endif -%}
-
 # TLS everywhere related vars. #
 enable_tls_everywhere: true
 novajoin_connect_timeout: 60

config/general_config/featureset050.yml

@@ -27,10 +27,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 -%}

config/general_config/featureset053.yml

@@ -162,10 +162,3 @@ grafana_enabled: false
 statsd_enabled: false
 rsyslog_forwarding: false
 browbeat_config_file: browbeat-minimal-ci.yaml.j2
-
-undercloud_container_cli: >-
-  {% if release in ['rocky'] -%}
-  docker
-  {%- else -%}
-  podman
-  {%- endif -%}

config/general_config/featureset061.yml

@@ -97,5 +97,4 @@ tempest_whitelist:
 
 test_black_regex: []
 
-undercloud_container_cli: podman
 minion_container_cli: podman