Merge pull request #309 from ComputeCanada/goodbye7

Drop support for CentOS 7
ComputeCanada · Jun 10, 2024 · cf1d050 · cf1d050
2 parents e3e390b + cc261df
commit cf1d050
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/common/configuration/puppet.yaml b/common/configuration/puppet.yaml
@@ -28,32 +28,31 @@ runcmd:
   - chgrp ssh_keys /etc/ssh/ssh_host_*_key.pub
   - systemctl restart sshd
   # Enable fastest mirror for distribution using dnf package manager
-  - test -f /etc/dnf/dnf.conf && (grep -qxF "fastestmirror=True" /etc/dnf/dnf.conf || echo "fastestmirror=True" >> /etc/dnf/dnf.conf)
+  - dnf config-manager --setopt=fastestmirror=True --save
   # Install package and configure kernel only if building from a "vanilla" linux image
   - |
     if ! test -f /etc/magic-castle-release; then
       # Install required packages in runcmd instead of packages to speedup configuration
       # of the admin user. This reduces the risk of Terraform timing out when trying to
       # upload the terraform_data.yaml
-      yum -y install git pciutils unzip
-      yum remove -y firewalld --exclude=iptables
+      dnf -y install git pciutils unzip
+      dnf -y remove cockpit\* firewalld --exclude=iptables
 %{ if ! skip_upgrade ~}
       # Upgrade all packages except Puppet if already installed
-      yum -y upgrade -x puppet*
+      dnf -y upgrade -x puppet*
 %{ endif ~}
       # Puppet agent configuration and install
-      yum -y install https://yum.puppet.com/puppet7-release-el-$(grep -oP 'VERSION_ID="\K[^"]' /etc/os-release).noarch.rpm
-      yum -y install puppet-agent-7.28.0
+      dnf -y install https://yum.puppet.com/puppet7-release-el-$(grep -oP 'VERSION_ID="\K[^"]' /etc/os-release).noarch.rpm
+      dnf -y install puppet-agent-7.28.0
       install -m 700 /dev/null /opt/puppetlabs/bin/postrun
       # kernel configuration
       systemctl disable kdump
-      sed -i 's/crashkernel=auto/crashkernel=no/' /etc/default/grub
-      sed -i 's/GRUB_CMDLINE_LINUX="[^"]*/& nouveau.modeset=0 rd.driver.blacklist=nouveau/' /etc/default/grub
+      grubby --update-kernel=ALL --args="rd.driver.blacklist=nouveau nouveau.modeset=0"
       grub2-mkconfig -o /boot/grub2/grub.cfg
     fi
 %{ if contains(tags, "puppet") }
 # Install Java 11 and puppetserver
-  - yum -y install java-11-openjdk-headless puppetserver-7.14.0
+  - dnf -y install java-11-openjdk-headless puppetserver-7.14.0
 # Configure puppetserver to use Java 11
   - sudo sed -i 's;\(JAVA_BIN=\).*;\1"/usr/lib/jvm/jre-11/bin/java";g' /etc/sysconfig/puppetserver
 # Configure puppet-agent to start after puppetserver when on puppetserver

diff --git a/docs/README.md b/docs/README.md
@@ -412,7 +412,7 @@ To specify a different image for an instance type, use the
 [`image` instance attribute](#472-optional-attributes)
 
 **Requirements**: the operating system on the image must be from the RedHat family.
-This includes CentOS (7, 8), Rocky Linux (8), and AlmaLinux (8).
+This includes CentOS (8, 9), Rocky Linux (8, 9), and AlmaLinux (8, 9).
 
 **Post build modification effect**: none. If this variable is modified, existing
 instances will ignore the change and future instances will use the new value.

diff --git a/docs/matrix.md b/docs/matrix.md
@@ -49,9 +49,9 @@
 | Google HPC-Toolkit           | yes      | no       | no            | no          | no        | no        | no        | no         |
 | Cluster in the Cloud         | no       | yes      | no            | no          | no        | no        | no        | no         |
 | ElastiCluster                | yes      | yes      | yes           | yes         | no        | no        | no        | no         |
-| Magic Castle                 | yes      | yes      | yes           | yes         | no        | no        | no        | no         |
+| Magic Castle                 | no       | yes      | yes           | yes         | no        | no        | no        | no         |
 | On-Demand Data Centre        | -        | -        | -             | -           | -         | -         | -         | -          |
-| Slurm on GCP                 | yes      | no       | no            | no          | yes       | no        | yes       | no         |
+| Slurm on GCP                 | yes      | no       | yes           | no          | yes       | no        | yes       | no         |
 
 
 ## Supported job schedulers