Merge branch 'release/5.1.0'

CHANGELOG.md

@@ -1,10 +1,15 @@
 # Ansible Role for Podman
 
-## 5.1.0 - TBC
+## 5.2.0 - TBC
 
 ### Major Changes
 
-  - Upgrade minimal Ansible community package support to 4.1.0
+## 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.2.0
   - Support Debian 11
   - Support openSUSE Leap 15.3
   - Improve download archive logic
@@ -22,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
@@ -82,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

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
 

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] }}"

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

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

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:

vars/main.yml

@@ -15,31 +15,31 @@
 # limitations under the License.
 
 _podman_version:
-  "v3.2": "v3.2.2"
-  "v3.1": "v3.1.2"
+  "3.2": "3.2.3"
+  "3.1": "3.1.2"
 
 _podman_download:
-  "v3.2.2":
+  "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"
+  "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.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":
+  "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"