Skip to content

Commit

Permalink
Support EL9, Debian 11, Ubuntu 22.04
Browse files Browse the repository at this point in the history
  • Loading branch information
treydock committed Aug 22, 2023
1 parent 8f72469 commit 109fbdd
Show file tree
Hide file tree
Showing 11 changed files with 106 additions and 44 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,11 @@ jobs:
set:
- "el7"
- "el8"
- "el9"
- "debian-10"
- "debian-11"
- "ubuntu-2004"
- "ubuntu-2204"
puppet:
- "puppet7"
- "puppet8"
Expand Down
10 changes: 3 additions & 7 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
set:
- el7
- el8
- ---el9
- el9
- debian-10
- debian-11
- ubuntu-2004
- ubuntu-2204
puppet:
- puppet7
- puppet8
Expand All @@ -18,9 +20,3 @@ spec/spec_helper_acceptance.rb:
spec_overrides:
- "proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))"
- "copy_root_module_to(hosts, source: File.join(proj_root, 'tests/site_munge'), module_name: 'site_munge', ignore_list: [])"
spec/acceptance/nodesets/el9.yml:
delete: true
spec/acceptance/nodesets/debian-11.yml:
delete: true
spec/acceptance/nodesets/ubuntu-2204.yml:
delete: true
36 changes: 7 additions & 29 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,32 +35,10 @@ Manage munge and define a site specific munge.key

This module has been tested on:

* CentOS/RedHat 6 x86_64
* CentOS/RedHat 7 x86_64

## Development

### Testing

Testing requires the following dependencies:

* rake
* bundler

Install gem dependencies

bundle install

Run unit tests

bundle exec rake test

If you have Vagrant >= 1.2.0 installed you can run system tests

bundle exec rake beaker

## TODO

## Further Information

*
* RedHat/CentOS 7
* RedHat/Rocky/AlmaLinux 8
* RedHat/Rocky/AlmaLinux 9
* Debian 10
* Debian 11
* Ubuntu 20.04
* Ubuntu 22.04
1 change: 1 addition & 0 deletions data/os/RedHat.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
munge::manage_repo: false
munge::dev_package_name: munge-devel
munge::munge_user_shell: /sbin/nologin
munge::munge_user_home: /var/run/munge
2 changes: 2 additions & 0 deletions data/os/RedHat/7.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
munge::manage_repo: true
2 changes: 0 additions & 2 deletions data/os/RedHat/8.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
# An array of additional options to pass when installing a package. Typical usage is enabling certain repositories like EPEL.
#
class munge (
Boolean $manage_repo = true,
Boolean $manage_repo = false,
String $package_ensure = 'present',
String $package_name = 'munge',
Boolean $install_dev = false,
Expand Down
15 changes: 10 additions & 5 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"7",
"8"
"8",
"9"
]
},
{
Expand All @@ -34,25 +35,29 @@
{
"operatingsystem": "Rocky",
"operatingsystemrelease": [
"8"
"8",
"9"
]
},
{
"operatingsystem": "AlmaLinux",
"operatingsystemrelease": [
"8"
"8",
"9"
]
},
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"10"
"10",
"11"
]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"20.04"
"20.04",
"22.04"
]
}
],
Expand Down
28 changes: 28 additions & 0 deletions spec/acceptance/nodesets/debian-11.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
HOSTS:
debian11:
roles:
- agent
platform: debian-11-amd64
hypervisor: docker
image: debian:11
docker_preserve_image: true
docker_cmd:
- '/sbin/init'
docker_image_commands:
- 'apt-get install -y wget net-tools systemd-sysv locales apt-transport-https ca-certificates'
- 'echo "LC_ALL=en_US.UTF-8" >> /etc/environment'
- 'echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen'
- 'echo "LANG=en_US.UTF-8" > /etc/locale.conf'
- 'locale-gen en_US.UTF-8'
docker_env:
- LANG=en_US.UTF-8
- LANGUAGE=en_US.UTF-8
- LC_ALL=en_US.UTF-8
docker_container_name: 'munge-debian11'
CONFIG:
log_level: debug
type: foss
ssh:
password: root
auth_methods: ["password"]

26 changes: 26 additions & 0 deletions spec/acceptance/nodesets/el9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
HOSTS:
almalinux-9:
roles:
- agent
platform: el-9-x86_64
hypervisor: docker
image: almalinux:9
docker_preserve_image: true
docker_cmd:
- '/usr/sbin/init'
docker_image_commands:
- 'dnf install -y dnf-utils'
- 'dnf config-manager --set-enabled crb'
- 'dnf install -y wget which cronie iproute initscripts langpacks-en glibc-all-langpacks glibc-langpack-en cpio'
docker_env:
- LANG=en_US.UTF-8
- LANGUAGE=en_US.UTF-8
- LC_ALL=en_US.UTF-8
docker_container_name: 'munge-el9'
CONFIG:
log_level: debug
type: foss
ssh:
password: root
auth_methods: ["password"]

25 changes: 25 additions & 0 deletions spec/acceptance/nodesets/ubuntu-2204.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
HOSTS:
ubuntu2204:
roles:
- agent
platform: ubuntu-22.04-amd64
hypervisor : docker
image: ubuntu:22.04
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
- 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates'
- 'locale-gen en_US.UTF-8'
docker_env:
- LANG=en_US.UTF-8
- LANGUAGE=en_US.UTF-8
- LC_ALL=en_US.UTF-8
docker_container_name: 'munge-ubuntu2204'
CONFIG:
log_level: debug
type: foss
ssh:
password: root
auth_methods: ["password"]

0 comments on commit 109fbdd

Please sign in to comment.