Revert "temporarily turn off podman"

This reverts commit 6822ba9a7e.
We disabled the relabeling on /run/netns, it should
work better now.

It also properly enables podman on the overcloud without extra_args,
which will avoid issues when overriding the extra args.

Depends-On: I34813b240284c8d9b35e044bc9654d556ec0cbdb
Change-Id: Id75697e86cd5d08d116d6b074342801da4572f2f
This commit is contained in:
Emilien Macchi 2018-12-22 11:07:23 +00:00
parent 1b1caacdab
commit a8029c8f9b
7 changed files with 46 additions and 64 deletions

View File

@ -155,12 +155,9 @@ undercloud_enable_tempest: >-
false
{%- endif -%}
# https://bugs.launchpad.net/tripleo/+bug/1804434
# https://github.com/containers/libpod/issues/1844
undercloud_container_cli: docker
# undercloud_container_cli: >-
# {% if release in ['rocky'] -%}
# docker
# {%- else -%}
# podman
# {%- endif -%}
undercloud_container_cli: >-
{% if release in ['rocky'] -%}
docker
{%- else -%}
podman
{%- endif -%}

View File

@ -94,13 +94,13 @@ undercloud_enable_tempest: >-
false
{%- endif -%}
# https://bugs.launchpad.net/tripleo/+bug/1804434
# https://github.com/containers/libpod/issues/1844
undercloud_container_cli: docker
# undercloud_container_cli: >-
# {% if release in ['rocky'] -%}
# docker
# {%- else -%}
# podman
# {%- 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

View File

@ -126,12 +126,9 @@ mistral_test_black_regex:
- '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'
# https://bugs.launchpad.net/tripleo/+bug/1804434
# https://github.com/containers/libpod/issues/1844
undercloud_container_cli: docker
# undercloud_container_cli: >-
# {% if release in ['rocky'] -%}
# docker
# {%- else -%}
# podman
# {%- endif -%}
undercloud_container_cli: >-
{% if release in ['rocky'] -%}
docker
{%- else -%}
podman
{%- endif -%}

View File

@ -111,12 +111,9 @@ test_white_regex: ''
tempest_whitelist:
- 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
# https://bugs.launchpad.net/tripleo/+bug/1804434
# https://github.com/containers/libpod/issues/1844
undercloud_container_cli: docker
# undercloud_container_cli: >-
# {% if release in ['rocky'] -%}
# docker
# {%- else -%}
# podman
# {%- endif -%}
undercloud_container_cli: >-
{% if release in ['rocky'] -%}
docker
{%- else -%}
podman
{%- endif -%}

View File

@ -25,12 +25,9 @@ run_tempest: false
undercloud_generate_service_certificate: true
undercloud_enable_swift_encryption: true
# https://bugs.launchpad.net/tripleo/+bug/1804434
# https://github.com/containers/libpod/issues/1844
undercloud_container_cli: docker
# undercloud_container_cli: >-
# {% if release in ['rocky'] -%}
# docker
# {%- else -%}
# podman
# {%- endif -%}
undercloud_container_cli: >-
{% if release in ['rocky'] -%}
docker
{%- else -%}
podman
{%- endif -%}

View File

@ -37,12 +37,9 @@ tempest_whitelist:
- 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps'
- 'tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern'
# https://bugs.launchpad.net/tripleo/+bug/1804434
# https://github.com/containers/libpod/issues/1844
standalone_container_cli: docker
# standalone_container_cli: >-
# {% if release in ['rocky'] -%}
# docker
# {%- else -%}
# podman
# {%- endif -%}
standalone_container_cli: >-
{% if release in ['rocky'] -%}
docker
{%- else -%}
podman
{%- endif -%}

View File

@ -163,12 +163,9 @@ statsd_enabled: false
rsyslog_forwarding: false
browbeat_config_file: browbeat-minimal-ci.yaml.j2
# https://bugs.launchpad.net/tripleo/+bug/1804434
# https://github.com/containers/libpod/issues/1844
undercloud_container_cli: docker
# undercloud_container_cli: >-
# {% if release in ['rocky'] -%}
# docker
# {%- else -%}
# podman
# {%- endif -%}
undercloud_container_cli: >-
{% if release in ['rocky'] -%}
docker
{%- else -%}
podman
{%- endif -%}