From c2365b3ab7a8051f15ec40db32d9b585fc6b8d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Wed, 2 Sep 2020 15:38:44 +0200 Subject: [PATCH] Fix podman and buildah only on rhel-8.2 Newer rhel version will provide newer tools, let's allow them for now and decide if we must get some new redhat-8.3.yml and so on. Change-Id: I81434e914d9c84a093f726181f7bb4a9b2042062 --- .../roles/tripleo_podman/vars/redhat-8.2.yml | 26 +++++++++++++++++++ .../roles/tripleo_podman/vars/redhat.yml | 4 +-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 tripleo_ansible/roles/tripleo_podman/vars/redhat-8.2.yml diff --git a/tripleo_ansible/roles/tripleo_podman/vars/redhat-8.2.yml b/tripleo_ansible/roles/tripleo_podman/vars/redhat-8.2.yml new file mode 100644 index 000000000..efa3a20cf --- /dev/null +++ b/tripleo_ansible/roles/tripleo_podman/vars/redhat-8.2.yml @@ -0,0 +1,26 @@ +--- +# Copyright 2019 Red Hat, Inc. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + + +_tripleo_podman_packages: + - podman-1.6.4 + +_tripleo_buildah_packages: + - buildah-1.11.6 + +_tripleo_podman_purge_packages: + - docker + - docker-ce diff --git a/tripleo_ansible/roles/tripleo_podman/vars/redhat.yml b/tripleo_ansible/roles/tripleo_podman/vars/redhat.yml index efa3a20cf..5de10171a 100644 --- a/tripleo_ansible/roles/tripleo_podman/vars/redhat.yml +++ b/tripleo_ansible/roles/tripleo_podman/vars/redhat.yml @@ -16,10 +16,10 @@ _tripleo_podman_packages: - - podman-1.6.4 + - podman _tripleo_buildah_packages: - - buildah-1.11.6 + - buildah _tripleo_podman_purge_packages: - docker