Merge pull request #378 from ComputeCanada/el10

Fixes to be able to complete the puppet installation and configuration with EL10 images

Author: cmd-ntrf

common/configuration/puppet.yaml.tftpl

@@ -35,6 +35,11 @@ runcmd:
     # most container images do not have selinux pre-installed
   - restorecon -R /${sudoer_username}
 %{ endif }
+  # If the image has not openssh-server installed but sshd_config still exists
+  # installing the new RPM will not overwrite the file and depending on the file
+  # content it might catastrophic (some sshd_config are empty, some miss esential lines).
+  # Therefore when openssh-server is not installed, we remove sshd_config before installing it.
+  - "[ -z $(rpm -qa openssh-server) ] && rm -f /etc/ssh/sshd_config"
   - dnf -y install openssh openssh-server rsync
   - echo -e "Include /etc/ssh/sshd_config.d/50-authenticationmethods.conf" >> /etc/ssh/sshd_config
   - sed -i '/HostKey \/etc\/ssh\/ssh_host_ecdsa_key/ s/^#*/#/' /etc/ssh/sshd_config
@@ -64,8 +69,8 @@ runcmd:
       dnf -y upgrade -x openvox*
 %{ endif ~}
       # Puppet agent configuration and install
-      dnf -y install https://yum.voxpupuli.org/openvox8-release-el-$(grep -oP 'VERSION_ID="\K[^"]' /etc/os-release).noarch.rpm
-      dnf -y install openvox-agent-8.19.2
+      dnf -y install https://yum.voxpupuli.org/openvox8-release-el-$(grep -oP 'VERSION_ID="\K\d*' /etc/os-release).noarch.rpm
+      dnf -y install openvox-agent-8.23.1
       install -m 700 /dev/null /opt/puppetlabs/bin/postrun
       # kernel configuration
       systemctl disable kdump
@@ -74,7 +79,7 @@ runcmd:
     fi
 %{ if contains(tags, "puppet") }
 # Install puppetserver
-  - dnf -y install openvox-server-8.8.1
+  - dnf -y install openvox-server-8.11.0
 # Configure puppet-agent to start after puppetserver when on puppetserver
   - sed -i 's/^\(After=.*\)$/\1 puppetserver.service/' /usr/lib/systemd/system/puppet.service
   - systemctl daemon-reload