Merge pull request #9 from metno/add_noble

2.2.0 - Added support for ubuntu noble
metno · Mar 6, 2024 · 8b68425 · 8b68425
2 parents 483ab1a + d1ad1a0
commit 8b68425
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,7 @@ Role for handling `/etc/sysctl.d/*.conf` files. Applies new sysctl setting on ru
 Version
 -------
 
+* `2.2.0` --- Add Ubuntu 24.04 noble support
 * `2.1.2` --- Allow Fedora CoreOS 39
 * `2.1.1` --- bug fix, ansible-lint
 * `2.1.0` --- add Fedora CoreOS support
@@ -25,6 +26,7 @@ Requirements
 
 This role is limited to
 
+* Ubuntu 24.04 - Noble
 * Ubuntu 22.04 - Jammy
 * Ubuntu 20.04 - Focal
 * Ubuntu 18.04 - Bionic

diff --git a/meta/main.yml b/meta/main.yml
@@ -1,12 +1,11 @@
 # vim: ai et ts=2 st=2 sw=2 :
 ---
 galaxy_info:
-  standalone: true
   author: Arnulf Heimsbakk
   description: Handle sysctl.d files
   company: MET Norway
   role_name: sysctl
-  namespace: met
+  namespace: metno
 
   license: GPLv2
 
@@ -15,6 +14,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - "noble"
         - "jammy"
         - "focal"
         - "bionic"

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -6,7 +6,7 @@
     success_msg: "{{ role_name }} supports {{ ansible_distribution }} version {{ ansible_distribution_version }}"
     quiet: "{{ not ansible_check_mode }}"
     that:
-      ( ansible_distribution|lower == "ubuntu" and ansible_distribution_version|int in [16, 18, 20, 22] )
+      ( ansible_distribution|lower == "ubuntu" and ansible_distribution_version|int in [16, 18, 20, 22, 24] )
       or ( ansible_distribution|lower == "centos" and ansible_distribution_major_version|int in [7, 8] )
       or ( ansible_distribution|lower == "redhat" and ansible_distribution_major_version|int in [8, 9] )
       or ( ansible_distribution|lower == "fedora" and ansible_distribution_major_version|int in [38, 39] )

diff --git a/tests/Vagrantfile b/tests/Vagrantfile
@@ -5,12 +5,13 @@ CURRENT_PATH = File.dirname(File.expand_path(__FILE__))
 
 Vagrant.configure("2") do |config|
   boxes = [
+    { :name => "noble", :box => "ubuntu/noble64" },
     { :name => "jammy", :box => "ubuntu/jammy64" },
     { :name => "focal", :box => "ubuntu/focal64" },
     { :name => "bionic", :box => "ubuntu/bionic64" },
     { :name => "xenial", :box => "ubuntu/xenial64" },
     { :name => "centos7", :box => "centos/7" },
-    { :name => "centos8", :box => "centos/stream8" },
+    { :name => "centos8", :box => "generic/centos8s" },
     { :name => "rhel8", :box => "generic/rhel8" },
     { :name => "rhel9", :box => "generic/rhel9" },
   ]