sunet-cdn/cdn-ops
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #54 from SUNET/pahol-ubuntu24

Browse source 
Ubuntu-24 fixes
This commit is contained in:
Johan Wassberg 2024-06-19 15:07:17 +02:00 committed by GitHub
parent 5d88e66379 4231b4ac1d
commit 5518048d79
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
global/overlay/etc/puppet/hiera.yaml
View file

@ -21,7 +21,7 @@ hierarchy:
pkcs7_public_key: /etc/hiera/eyaml/public_certkey.pkcs7.pem pkcs7_public_key: /etc/hiera/eyaml/public_certkey.pkcs7.pem
- name: "Overrides per distribution" - name: "Overrides per distribution"
path: "dist_%{::lsbdistcodename}_override.yaml" path: "dist_%{facts.os.distro.codename}_override.yaml"
- name: "Data common to whole environment" - name: "Data common to whole environment"
path: "common.yaml" path: "common.yaml"

2
global/pre-tasks.d/030puppet
View file

@ -13,7 +13,7 @@ if ! test -f "${stamp}" -a -f /usr/bin/puppet; then
. /etc/os-release . /etc/os-release
# Note: in posix shell, string comparison is done with a single = # Note: in posix shell, string comparison is done with a single =
if [ "${ID}" = "debian" ] && [ "${VERSION_ID}" -ge 12 ]; then if [ "${ID}" = "debian" ] && [ "${VERSION_ID}" -ge 12 ] || ([ "${ID}" = "ubuntu" ] && $(dpkg --compare-versions ${VERSION_ID} ge 24.04)) ; then
apt-get -y install \ apt-get -y install \
cron \ cron \
puppet-module-camptocamp-augeas \ puppet-module-camptocamp-augeas \