From 0cc2857843fac13303e86fb8cf268838afbd6032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Wed, 5 May 2021 17:18:48 +0200 Subject: [PATCH] Remove redhat-8.2.yml var file This will not work when an operator wants to upgrades from osp-16.1 to osp-16.2: 16.2 is targeting rhel-8.4 with container-tools:3.0, providing a newer podman version. During the upgrade process, we end in a state where we're still running rhel-8.2, with container-tools:3.0 enabled - leading to an issue when it comes to the podman version we can get. Removing this file (and backporting this change down to stable/train) will allow a swift and smooth fix. As a last word, this "last security" isn't that useful anymore, since we have a task that ensures we have the correct module stream[1][2]. [1] https://opendev.org/openstack/tripleo-heat-templates/src/branch/master/deployment/undercloud/undercloud-upgrade.yaml#L67 [2] https://opendev.org/openstack/tripleo-heat-templates/src/branch/master/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml#L261 Closes-Bug: #1927242 Change-Id: Id07aa060dd90fdef9a1cd0a44ddbeaee7d561d18 (cherry picked from commit 3304f4ab3591a87e5dd273a0f1559ed0f828342f) --- .../roles/tripleo_podman/vars/redhat-8.2.yml | 26 ------------------- 1 file changed, 26 deletions(-) delete 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 deleted file mode 100644 index efa3a20cf..000000000 --- a/tripleo_ansible/roles/tripleo_podman/vars/redhat-8.2.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# 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