Merge pull request #358 from prolixalias/feature_extend_regex

(#357) Add Ubuntu 22.04 LTS (Jammy Jellyfish) support
voxpupuli · Dec 7, 2023 · 78834f7 · 78834f7
2 parents 5fa2932 + ef46355
commit 78834f7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -311,7 +311,7 @@ Default value: `false`
 
 ##### <a name="-puppetboard--python_version"></a>`python_version`
 
-Data type: `Pattern[/^3\.\d+$/]`
+Data type: `Pattern[/^3\.\d{1,2}$|^3\.\d{1,2}\.\d{1,2}$/]`
 
 Python version to use in virtualenv.
 

diff --git a/data/os/Ubuntu.22.04.yaml b/data/os/Ubuntu.22.04.yaml
@@ -0,0 +1 @@
+puppetboard::python_version: '3.10'
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -61,7 +61,7 @@
 class puppetboard (
   Stdlib::Absolutepath $apache_confd,
   String[1] $apache_service,
-  Pattern[/^3\.\d+$/] $python_version,
+  Pattern[/^3\.\d{1,2}$|^3\.\d{1,2}\.\d{1,2}$/] $python_version,
   Enum['package', 'pip', 'vcsrepo'] $install_from             = 'pip',
   Boolean $manage_selinux                                     = pick($facts['os.selinux.enabled'], false),
   String $user                                                = 'puppetboard',

diff --git a/metadata.json b/metadata.json
@@ -31,7 +31,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "18.04",
-        "20.04"
+        "20.04",
+        "22.04"
       ]
     }
   ],