commit 745a0b10fca3f5b72a0fdda95cb272670ad68b21 Author: Cédric Jeanneret Date: Tue Aug 4 16:53:29 2020 +0200 Fix podman version Since ansible "package" takes the version in the name directly, let's ensure we have the "latest" of that version. This allows to still use per-OS or per-release podman version in a convenient and easy way. Note: this one differs a bit from the original change, since rhel-7 based systems don't provide podman 1.6.4, but an older version. This patch therefore adds a new redhat-7.yml file with the relevant information. Depends-On: https://review.opendev.org/746639 Change-Id: I9d8ba2818c7b00893473360b8098ae5cdecbb256 (cherry picked from commit 845fafd601963244249bc19aed6b6361657e6d20) (cherry picked from commit ad0749ff11349cc7a6c860076887fe602003ed81) diff --git a/tripleo_ansible/roles/tripleo-podman/vars/centos-7.yml b/tripleo_ansible/roles/tripleo-podman/vars/centos-7.yml new file mode 100644 index 0000000..e6aa4de --- /dev/null +++ b/tripleo_ansible/roles/tripleo-podman/vars/centos-7.yml @@ -0,0 +1,23 @@ +--- +# 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 + +_tripleo_podman_purge_packages: + - docker + - docker-ce diff --git a/tripleo_ansible/roles/tripleo-podman/vars/redhat-7.yml b/tripleo_ansible/roles/tripleo-podman/vars/redhat-7.yml new file mode 100644 index 0000000..e6aa4de --- /dev/null +++ b/tripleo_ansible/roles/tripleo-podman/vars/redhat-7.yml @@ -0,0 +1,23 @@ +--- +# 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 + +_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 dc42eb3..efa3a20 100644 --- a/tripleo_ansible/roles/tripleo-podman/vars/redhat.yml +++ b/tripleo_ansible/roles/tripleo-podman/vars/redhat.yml @@ -16,7 +16,7 @@ _tripleo_podman_packages: - - podman + - podman-1.6.4 _tripleo_buildah_packages: - buildah-1.11.6