From 258c1f26eb7af839a069ab6a6308e6118e98bba1 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Sat, 17 Jul 2021 12:06:45 +0800 Subject: [PATCH 1/4] https://github.com/containers/podman/releases/tag/v3.2.3 --- vars/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vars/main.yml b/vars/main.yml index bb0144c..c290361 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -15,10 +15,14 @@ # limitations under the License. _podman_version: - "v3.2": "v3.2.2" + "v3.2": "v3.2.3" "v3.1": "v3.1.2" _podman_download: + "v3.2.3": + url: "http://github.com/alvistack/containers-podman/releases/download/v3.2.3/podman-v3.2.3-linux-amd64" + dest: "/var/cache/ansible/9cb0aa4aa80d010c0e3488d86fbf8180ec14c7b4670754f229fd748e7b74277a/podman-v3.2.3-linux-amd64" + checksum: "9cb0aa4aa80d010c0e3488d86fbf8180ec14c7b4670754f229fd748e7b74277a" "v3.2.2": url: "http://github.com/alvistack/containers-podman/releases/download/v3.2.2/podman-v3.2.2-linux-amd64" dest: "/var/cache/ansible/fe957eeb46d48ec327ef732a010c866a1ebf2d306717f950087abe449cdc7b24/podman-v3.2.2-linux-amd64" @@ -27,10 +31,6 @@ _podman_download: url: "http://github.com/alvistack/containers-podman/releases/download/v3.2.1/podman-v3.2.1-linux-amd64" dest: "/var/cache/ansible/2ef4a5297c3faa1de75f91c746ae836492e1bfcbb6916d67c377756a6aafd69c/podman-v3.2.1-linux-amd64" checksum: "2ef4a5297c3faa1de75f91c746ae836492e1bfcbb6916d67c377756a6aafd69c" - "v3.2.0": - url: "http://github.com/alvistack/containers-podman/releases/download/v3.2.0/podman-v3.2.0-linux-amd64" - dest: "/var/cache/ansible/118404d002d11dce110c9739a038d8bb8d6a6574e93801cb05e9bf959fb4db8f/podman-v3.2.0-linux-amd64" - checksum: "118404d002d11dce110c9739a038d8bb8d6a6574e93801cb05e9bf959fb4db8f" "v3.1.2": url: "http://github.com/alvistack/containers-podman/releases/download/v3.1.2/podman-v3.1.2-linux-amd64" dest: "/var/cache/ansible/90e2f01ff3fe0e7d6c3dfb63af8f83f3f0972725a088a37209709a16e6246aee/podman-v3.1.2-linux-amd64" From 3198b4aea86f4421b17623c80274122d1e149cde Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Sat, 17 Jul 2021 15:50:35 +0800 Subject: [PATCH 2/4] yum install -y python3-dnf-plugin-versionlock --- molecule/default/prepare.yml | 6 +++--- scripts/bootstrap-ansible.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml index a6c9d33..f4c7574 100644 --- a/molecule/default/prepare.yml +++ b/molecule/default/prepare.yml @@ -102,7 +102,7 @@ - name: fedora | yum install *.rpm raw: | set -eu - yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-cryptography python3-devel python3-jmespath python3-libselinux python3-lxml python3-netaddr python3-pip python3-setuptools python3-virtualenv python3-wheel rsync shadow-utils sudo tar unzip util-linux xz yum-utils zip + yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-cryptography python3-devel python3-dnf-plugin-versionlock python3-jmespath python3-libselinux python3-lxml python3-netaddr python3-pip python3-setuptools python3-virtualenv python3-wheel rsync shadow-utils sudo tar unzip util-linux xz yum-utils zip when: ansible_distribution | lower == "fedora" changed_when: false failed_when: false @@ -111,7 +111,7 @@ raw: | set -eu yum install -y http://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm - yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-cryptography python3-devel python3-jmespath python3-libselinux python3-lxml python3-netaddr python3-pip python3-setuptools python3-virtualenv python3-wheel rsync shadow-utils sudo tar unzip util-linux xz yum-utils zip + yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-cryptography python3-devel python3-dnf-plugin-versionlock python3-jmespath python3-libselinux python3-lxml python3-netaddr python3-pip python3-setuptools python3-virtualenv python3-wheel rsync shadow-utils sudo tar unzip util-linux xz yum-utils zip when: ansible_os_family | lower == "redhat" and ansible_distribution_major_version | lower == "8" changed_when: false failed_when: false @@ -121,7 +121,7 @@ set -eu subscription-manager repos --enable=rhel-7-server-optional-rpms || echo $? yum install -y http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-devel python3-jmespath python3-libselinux python3-lxml python3-pip python3-setuptools python3-virtualenv python3-wheel python36-cryptography python36-netaddr rsync shadow-utils sudo tar unzip util-linux xz yum-utils zip + yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-devel python3-jmespath python3-libselinux python3-lxml python3-pip python3-setuptools python3-virtualenv python3-wheel python36-cryptography python36-netaddr rsync shadow-utils sudo tar unzip util-linux xz yum-plugin-versionlock yum-utils zip when: ansible_os_family | lower == "redhat" and ansible_distribution_major_version | lower == "7" changed_when: false failed_when: false diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index 4b100e6..80af816 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -30,7 +30,7 @@ fi if [ -x "$(command -v yum)" ]; then yum makecache yum update -y - yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-cryptography python3-devel python3-jmespath python3-libselinux python3-lxml python3-netaddr python3-pip python3-setuptools python3-virtualenv python3-wheel sudo tar unzip xz yum-utils zip + yum install -y bzip2 ca-certificates curl gcc gnupg2 gzip iproute procps-ng python3 python3-cryptography python3-devel python3-dnf-plugin-versionlock python3-jmespath python3-libselinux python3-lxml python3-netaddr python3-pip python3-setuptools python3-virtualenv python3-wheel sudo tar unzip xz yum-utils zip fi # Prepare Zypper dependencies From fb4dc41d9f4ae4a93ec19f7f437b7f6be9fd2f87 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Sun, 18 Jul 2021 09:03:14 +0800 Subject: [PATCH 3/4] Move systemd service to `/etc/systemd` which generally available --- CHANGELOG.md | 1 + defaults/main.yml | 2 +- tasks/main.yml | 10 +++++----- .../systemd/system/podman.service.j2 | 0 .../{lib => etc}/systemd/system/podman.socket.j2 | 0 vars/main.yml | 16 ++++++++-------- 6 files changed, 15 insertions(+), 14 deletions(-) rename templates/{lib => etc}/systemd/system/podman.service.j2 (100%) rename templates/{lib => etc}/systemd/system/podman.socket.j2 (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffd3661..5c65f36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Major Changes + - Move systemd service to `/etc/systemd` which generally available - Upgrade minimal Ansible community package support to 4.1.0 - Support Debian 11 - Support openSUSE Leap 15.3 diff --git a/defaults/main.yml b/defaults/main.yml index 85e6ce3..80d85cf 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -15,7 +15,7 @@ # limitations under the License. # Podman release. -podman_release: "v3.2" +podman_release: "3.2" # Podman version. podman_version: "{{ _podman_version[podman_release] }}" diff --git a/tasks/main.yml b/tasks/main.yml index b2fab4d..eaabf01 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -63,7 +63,7 @@ loop: - { dest: "/etc/bash_completion.d" } - { dest: "/etc/cni/net.d" } - - { dest: "/lib/systemd/system" } + - { dest: "/etc/systemd/system" } - { dest: "/lib/tmpfiles.d" } - { dest: "/usr/local/bin" } - { dest: "/usr/share/containers" } @@ -117,8 +117,8 @@ - { dest: "/etc/bash_completion.d/podman" } - { dest: "/etc/cni/net.d/87-podman-bridge.conflist" } - { dest: "/lib/tmpfiles.d/podman.conf" } - - { dest: "/lib/systemd/system/podman.service" } - - { dest: "/lib/systemd/system/podman.socket" } + - { dest: "/etc/systemd/system/podman.service" } + - { dest: "/etc/systemd/system/podman.socket" } notify: - podman | systemctl daemon-reload - podman | systemctl restart podman.socket @@ -133,8 +133,8 @@ loop: - { dest: "/etc/bash_completion.d/podman" } - { dest: "/etc/cni/net.d/87-podman-bridge.conflist" } - - { dest: "/lib/systemd/system/podman.service" } - - { dest: "/lib/systemd/system/podman.socket" } + - { dest: "/etc/systemd/system/podman.service" } + - { dest: "/etc/systemd/system/podman.socket" } - { dest: "/lib/tmpfiles.d/podman.conf" } - { dest: "/usr/local/bin/podman", mode: "0755" } notify: diff --git a/templates/lib/systemd/system/podman.service.j2 b/templates/etc/systemd/system/podman.service.j2 similarity index 100% rename from templates/lib/systemd/system/podman.service.j2 rename to templates/etc/systemd/system/podman.service.j2 diff --git a/templates/lib/systemd/system/podman.socket.j2 b/templates/etc/systemd/system/podman.socket.j2 similarity index 100% rename from templates/lib/systemd/system/podman.socket.j2 rename to templates/etc/systemd/system/podman.socket.j2 diff --git a/vars/main.yml b/vars/main.yml index c290361..186b7ef 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -15,31 +15,31 @@ # limitations under the License. _podman_version: - "v3.2": "v3.2.3" - "v3.1": "v3.1.2" + "3.2": "3.2.3" + "3.1": "3.1.2" _podman_download: - "v3.2.3": + "3.2.3": url: "http://github.com/alvistack/containers-podman/releases/download/v3.2.3/podman-v3.2.3-linux-amd64" dest: "/var/cache/ansible/9cb0aa4aa80d010c0e3488d86fbf8180ec14c7b4670754f229fd748e7b74277a/podman-v3.2.3-linux-amd64" checksum: "9cb0aa4aa80d010c0e3488d86fbf8180ec14c7b4670754f229fd748e7b74277a" - "v3.2.2": + "3.2.2": url: "http://github.com/alvistack/containers-podman/releases/download/v3.2.2/podman-v3.2.2-linux-amd64" dest: "/var/cache/ansible/fe957eeb46d48ec327ef732a010c866a1ebf2d306717f950087abe449cdc7b24/podman-v3.2.2-linux-amd64" checksum: "fe957eeb46d48ec327ef732a010c866a1ebf2d306717f950087abe449cdc7b24" - "v3.2.1": + "3.2.1": url: "http://github.com/alvistack/containers-podman/releases/download/v3.2.1/podman-v3.2.1-linux-amd64" dest: "/var/cache/ansible/2ef4a5297c3faa1de75f91c746ae836492e1bfcbb6916d67c377756a6aafd69c/podman-v3.2.1-linux-amd64" checksum: "2ef4a5297c3faa1de75f91c746ae836492e1bfcbb6916d67c377756a6aafd69c" - "v3.1.2": + "3.1.2": url: "http://github.com/alvistack/containers-podman/releases/download/v3.1.2/podman-v3.1.2-linux-amd64" dest: "/var/cache/ansible/90e2f01ff3fe0e7d6c3dfb63af8f83f3f0972725a088a37209709a16e6246aee/podman-v3.1.2-linux-amd64" checksum: "90e2f01ff3fe0e7d6c3dfb63af8f83f3f0972725a088a37209709a16e6246aee" - "v3.1.1": + "3.1.1": url: "http://github.com/alvistack/containers-podman/releases/download/v3.1.1/podman-v3.1.1-linux-amd64" dest: "/var/cache/ansible/00ef5e03595c4e61de9b51472bf4e85991b4f76c90c58a3cc26135f29a336ae5/podman-v3.1.1-linux-amd64" checksum: "00ef5e03595c4e61de9b51472bf4e85991b4f76c90c58a3cc26135f29a336ae5" - "v3.1.0": + "3.1.0": url: "http://github.com/alvistack/containers-podman/releases/download/v3.1.0/podman-v3.1.0-linux-amd64" dest: "/var/cache/ansible/ac9dfeca5a043e1ae3e236fc6cf05e97d5c9e6e8bc9e85e46a9c607ed96af531/podman-v3.1.0-linux-amd64" checksum: "ac9dfeca5a043e1ae3e236fc6cf05e97d5c9e6e8bc9e85e46a9c607ed96af531" From b3903c0dea864bb4ddd77915b1be35e4eb6de137 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Sun, 18 Jul 2021 04:26:17 +0000 Subject: [PATCH 4/4] 5.1.0 --- CHANGELOG.md | 20 ++++++++++++++------ README.md | 15 ++++++++++----- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c65f36..deeed41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,15 @@ # Ansible Role for Podman -## 5.1.0 - TBC +## 5.2.0 - TBC + +### Major Changes + +## 5.1.0 - 2021-07-18 ### Major Changes - Move systemd service to `/etc/systemd` which generally available - - Upgrade minimal Ansible community package support to 4.1.0 + - Upgrade minimal Ansible community package support to 4.2.0 - Support Debian 11 - Support openSUSE Leap 15.3 - Improve download archive logic @@ -23,9 +27,12 @@ ### Major Changes - - Bugfix [ansible-lint `namespace`](https://github.com/ansible-community/ansible-lint/pull/1451) - - Bugfix [ansible-lint `no-handler`](https://github.com/ansible-community/ansible-lint/pull/1402) - - Bugfix [ansible-lint `unnamed-task`](https://github.com/ansible-community/ansible-lint/pull/1413) + - Bugfix [ansible-lint + `namespace`](https://github.com/ansible-community/ansible-lint/pull/1451) + - Bugfix [ansible-lint + `no-handler`](https://github.com/ansible-community/ansible-lint/pull/1402) + - Bugfix [ansible-lint + `unnamed-task`](https://github.com/ansible-community/ansible-lint/pull/1413) - Simplify Python dependency with system packages - Support RHEL 8 with Molecule - Support RHEL 7 with Molecule @@ -83,4 +90,5 @@ ## 4.2.0 - 2020-02-24 - Ininitial release for Ansible 2.9 or higher - - Support both Ubuntu 18.04/19.10 or RHEL/CentOS 7 or openSUSE Leap 15.1 + - Support both Ubuntu 18.04/19.10 or RHEL/CentOS 7 or openSUSE Leap + 15.1 diff --git a/README.md b/README.md index 146c8ee..9f0ef65 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,13 @@ # Ansible Role for Podman -[![Gitlab pipeline status](https://img.shields.io/gitlab/pipeline/alvistack/ansible-role-podman/master)](https://gitlab.com/alvistack/ansible-role-podman/-/pipelines) -[![GitHub release](https://img.shields.io/github/release/alvistack/ansible-role-podman.svg)](https://github.com/alvistack/ansible-role-podman/releases) -[![GitHub license](https://img.shields.io/github/license/alvistack/ansible-role-podman.svg)](https://github.com/alvistack/ansible-role-podman/blob/master/LICENSE) -[![Ansible Role](https://img.shields.io/badge/galaxy-alvistack.podman-blue.svg)](https://galaxy.ansible.com/alvistack/podman) +[![Gitlab pipeline +status](https://img.shields.io/gitlab/pipeline/alvistack/ansible-role-podman/master)](https://gitlab.com/alvistack/ansible-role-podman/-/pipelines) +[![GitHub +release](https://img.shields.io/github/release/alvistack/ansible-role-podman.svg)](https://github.com/alvistack/ansible-role-podman/releases) +[![GitHub +license](https://img.shields.io/github/license/alvistack/ansible-role-podman.svg)](https://github.com/alvistack/ansible-role-podman/blob/master/LICENSE) +[![Ansible +Role](https://img.shields.io/badge/galaxy-alvistack.podman-blue.svg)](https://galaxy.ansible.com/alvistack/podman) Ansible Role for Podman Installation. @@ -39,7 +43,8 @@ This role could simply deploy to `localhost` as below: ## License - Code released under [Apache License 2.0](LICENSE) - - Docs released under [CC BY 4.0](http://creativecommons.org/licenses/by/4.0/) + - Docs released under [CC + BY 4.0](http://creativecommons.org/licenses/by/4.0/) ## Author Information