Merge branch 'release/20210718.1.1'

alvistack · Jul 18, 2021 · aef3ead · aef3ead
2 parents bb35689 + 6a19ba4
commit aef3ead
Show file tree

Hide file tree

Showing 28 changed files with 75 additions and 50 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,12 +4,19 @@
 
 ### Major Changes
 
-  - Upgrade minimal Ansible community package support to 4.1.0
+## 20210718.1.1 - 2021-07-18
+
+### Major Changes
+
+  - Upgrade minimal Ansible community package support to 4.2.0
   - Support Ceph 16.2
   - Revamp with Packer
 
 ## 15.2.5-4alvistack1 - 2020-10-23
 
   - Ubuntu 20.04 based
-  - Base box running by [Vagrant Libvirt Provider](https://github.com/vagrant-libvirt/vagrant-libvirt)
-  - Provision by [Ansible](https://www.ansible.com/) and [Molecule Vagrant Plugin](https://github.com/ansible-community/molecule-vagrant)
+  - Base box running by [Vagrant Libvirt
+    Provider](https://github.com/vagrant-libvirt/vagrant-libvirt)
+  - Provision by [Ansible](https://www.ansible.com/) and [Molecule
+    Vagrant
+    Plugin](https://github.com/ansible-community/molecule-vagrant)
diff --git a/README.md b/README.md
@@ -1,11 +1,16 @@
 # Vagrant Box Packaging for Ceph
 
-[![Gitlab pipeline status](https://img.shields.io/gitlab/pipeline/alvistack/vagrant-ceph/master)](https://gitlab.com/alvistack/vagrant-ceph/-/pipelines)
-[![GitHub release](https://img.shields.io/github/release/alvistack/vagrant-ceph.svg)](https://github.com/alvistack/vagrant-ceph/releases)
-[![GitHub license](https://img.shields.io/github/license/alvistack/vagrant-ceph.svg)](https://github.com/alvistack/vagrant-ceph/blob/master/LICENSE)
-\-[![Vagrant Box download](https://img.shields.io/badge/dynamic/json?label=alvistack%2Fceph-16.2&query=%24.boxes%5B%3A1%5D.downloads&url=https%3A%2F%2Fapp.vagrantup.com%2Fapi%2Fv1%2Fsearch%3Fq%3Dalvistack%2Fceph-16.2)](https://app.vagrantup.com/alvistack/boxes/ceph-16.2)
-
-Ceph uniquely delivers object, block, and file storage in one unified system.
+[![Gitlab pipeline
+status](https://img.shields.io/gitlab/pipeline/alvistack/vagrant-ceph/master)](https://gitlab.com/alvistack/vagrant-ceph/-/pipelines)
+[![GitHub
+release](https://img.shields.io/github/release/alvistack/vagrant-ceph.svg)](https://github.com/alvistack/vagrant-ceph/releases)
+[![GitHub
+license](https://img.shields.io/github/license/alvistack/vagrant-ceph.svg)](https://github.com/alvistack/vagrant-ceph/blob/master/LICENSE)
+-[![Vagrant Box
+download](https://img.shields.io/badge/dynamic/json?label=alvistack%2Fceph-16.2&query=%24.boxes%5B%3A1%5D.downloads&url=https%3A%2F%2Fapp.vagrantup.com%2Fapi%2Fv1%2Fsearch%3Fq%3Dalvistack%2Fceph-16.2)](https://app.vagrantup.com/alvistack/boxes/ceph-16.2)
+
+Ceph uniquely delivers object, block, and file storage in one unified
+system.
 
 Learn more about Ceph: <https://ceph.io/>
 
@@ -21,14 +26,20 @@ Learn more about Ceph: <https://ceph.io/>
 ## Overview
 
   - Packaging with [Packer](https://www.packer.io/)
-  - Support [Vagrant](https://www.vagrantup.com/) as default [Ceph custom executor](https://docs.gitlab.com/runner/executors/README.html)
-  - Support [Libvirt](https://libvirt.org/) with [vagrant-libvirt](https://github.com/vagrant-libvirt/vagrant-libvirt)
+  - Support [Vagrant](https://www.vagrantup.com/) as default [Ceph
+    custom
+    executor](https://docs.gitlab.com/runner/executors/README.html)
+  - Support [Libvirt](https://libvirt.org/) with
+    [vagrant-libvirt](https://github.com/vagrant-libvirt/vagrant-libvirt)
   - Support [VirtualBox](https://www.virtualbox.org/)
   - Support [Docker](https://www.docker.com/)
 
 ### Quick Start
 
-Once you have [Vagrant](https://www.vagrantup.com/docs/installation) and [VirtaulBox](https://www.virtualbox.org/) installed, run the following commands under your [project directory](https://learn.hashicorp.com/tutorials/vagrant/getting-started-project-setup?in=vagrant/getting-started):
+Once you have [Vagrant](https://www.vagrantup.com/docs/installation) and
+[VirtaulBox](https://www.virtualbox.org/) installed, run the following
+commands under your [project
+directory](https://learn.hashicorp.com/tutorials/vagrant/getting-started-project-setup?in=vagrant/getting-started):
 
     # Initialize Vagrant
     vagrant init alvistack/ceph-16.2
@@ -46,16 +57,23 @@ Once you have [Vagrant](https://www.vagrantup.com/docs/installation) and [Virtau
 
 ### `YYYYMMDD.Y.Z`
 
-Release tags could be find from [GitHub Release](https://github.com/alvistack/vagrant-ceph/releases) of this repository. Thus using these tags will ensure you are running the most up to date stable version of this image.
+Release tags could be find from [GitHub
+Release](https://github.com/alvistack/vagrant-ceph/releases) of this
+repository. Thus using these tags will ensure you are running the most
+up to date stable version of this image.
 
 ### `YYYYMMDD.0.0`
 
-Version tags ended with `.0.0` are rolling release rebuild by [GitLab pipeline](https://gitlab.com/alvistack/vagrant-ceph/-/pipelines) in weekly basis. Thus using these tags will ensure you are running the latest packages provided by the base image project.
+Version tags ended with `.0.0` are rolling release rebuild by [GitLab
+pipeline](https://gitlab.com/alvistack/vagrant-ceph/-/pipelines) in
+weekly basis. Thus using these tags will ensure you are running the
+latest packages provided by the base image project.
 
 ## 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
 

diff --git a/packer/libvirt-15.2/packer.json b/packer/libvirt-15.2/packer.json
@@ -27,7 +27,7 @@
         "/casper/vmlinuz <wait5>",
         "initrd=/casper/initrd <wait5>",
         "autoinstall quiet fsck.mode=skip <wait5>",
-        "net.ifnames=0 biosdevname=0 <wait5>",
+        "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0 <wait5>",
         "ds=nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ <wait5>",
         "---<enter>"
       ],

diff --git a/packer/libvirt-15.2/user-data b/packer/libvirt-15.2/user-data
@@ -75,8 +75,8 @@ autoinstall:
             ssh-keygen -A; \
             systemctl enable ssh.service; \
             sed -ie "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=\"0\"/g" /etc/default/grub; \
-            sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \
-            sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \
+            sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \
+            sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \
             update-grub; \
             update-initramfs -c -k all; \
             apt-get -y purge snapd; \

diff --git a/packer/libvirt-16.2/packer.json b/packer/libvirt-16.2/packer.json
@@ -27,7 +27,7 @@
         "/casper/vmlinuz <wait5>",
         "initrd=/casper/initrd <wait5>",
         "autoinstall quiet fsck.mode=skip <wait5>",
-        "net.ifnames=0 biosdevname=0 <wait5>",
+        "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0 <wait5>",
         "ds=nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ <wait5>",
         "---<enter>"
       ],

diff --git a/packer/libvirt-16.2/user-data b/packer/libvirt-16.2/user-data
@@ -75,8 +75,8 @@ autoinstall:
             ssh-keygen -A; \
             systemctl enable ssh.service; \
             sed -ie "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=\"0\"/g" /etc/default/grub; \
-            sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \
-            sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \
+            sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \
+            sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \
             update-grub; \
             update-initramfs -c -k all; \
             apt-get -y purge snapd; \

diff --git a/packer/virtualbox-15.2/packer.json b/packer/virtualbox-15.2/packer.json
@@ -26,7 +26,7 @@
         "/casper/vmlinuz <wait5>",
         "initrd=/casper/initrd <wait5>",
         "autoinstall quiet fsck.mode=skip <wait5>",
-        "net.ifnames=0 biosdevname=0 <wait5>",
+        "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0 <wait5>",
         "ds=nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ <wait5>",
         "---<enter>"
       ],

diff --git a/packer/virtualbox-15.2/user-data b/packer/virtualbox-15.2/user-data
@@ -75,8 +75,8 @@ autoinstall:
             ssh-keygen -A; \
             systemctl enable ssh.service; \
             sed -ie "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=\"0\"/g" /etc/default/grub; \
-            sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \
-            sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \
+            sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \
+            sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \
             update-grub; \
             update-initramfs -c -k all; \
             apt-get -y purge snapd; \

diff --git a/packer/virtualbox-16.2/packer.json b/packer/virtualbox-16.2/packer.json
@@ -26,7 +26,7 @@
         "/casper/vmlinuz <wait5>",
         "initrd=/casper/initrd <wait5>",
         "autoinstall quiet fsck.mode=skip <wait5>",
-        "net.ifnames=0 biosdevname=0 <wait5>",
+        "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0 <wait5>",
         "ds=nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ <wait5>",
         "---<enter>"
       ],

diff --git a/packer/virtualbox-16.2/user-data b/packer/virtualbox-16.2/user-data
@@ -75,8 +75,8 @@ autoinstall:
             ssh-keygen -A; \
             systemctl enable ssh.service; \
             sed -ie "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=\"0\"/g" /etc/default/grub; \
-            sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \
-            sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub; \
+            sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \
+            sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub; \
             update-grub; \
             update-initramfs -c -k all; \
             apt-get -y purge snapd; \

diff --git a/playbooks/prepare.yml b/playbooks/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/playbooks/tasks/debian.yml b/playbooks/tasks/debian.yml
@@ -48,8 +48,8 @@
     state: "present"
   loop:
     - { option: "GRUB_DEFAULT", value: "0" }
-    - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0" }
-    - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0" }
+    - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" }
+    - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" }
 
 - name: update-grub
   command: update-grub

diff --git a/playbooks/tasks/redhat.yml b/playbooks/tasks/redhat.yml
@@ -39,8 +39,8 @@
     state: "present"
   loop:
     - { option: "GRUB_DEFAULT", value: "0" }
-    - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0" }
-    - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0" }
+    - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" }
+    - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" }
 
 - name: grub2-mkconfig -o /boot/grub2/grub.cfg
   command: grub2-mkconfig -o /boot/grub2/grub.cfg

diff --git a/playbooks/tasks/suse.yml b/playbooks/tasks/suse.yml
@@ -56,8 +56,8 @@
     state: "present"
   loop:
     - { option: "GRUB_DEFAULT", value: "0" }
-    - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0" }
-    - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0" }
+    - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" }
+    - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" }
 
 - name: grub2-mkconfig -o /boot/grub2/grub.cfg
   command: grub2-mkconfig -o /boot/grub2/grub.cfg

diff --git a/roles/ansible b/roles/ansible
diff --git a/roles/ceph_common b/roles/ceph_common
diff --git a/roles/ceph_mds b/roles/ceph_mds
diff --git a/roles/ceph_mgr b/roles/ceph_mgr
diff --git a/roles/ceph_mon b/roles/ceph_mon
diff --git a/roles/ceph_osd b/roles/ceph_osd
diff --git a/roles/ceph_rgw b/roles/ceph_rgw
diff --git a/roles/cloud_init b/roles/cloud_init
diff --git a/roles/kernel b/roles/kernel
diff --git a/roles/locales b/roles/locales
diff --git a/roles/python b/roles/python
diff --git a/roles/sshd b/roles/sshd
diff --git a/roles/timezone b/roles/timezone
diff --git 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