From ef4635512a1c9e1da3c893766d8f19f71279321a Mon Sep 17 00:00:00 2001 From: Paul Talbot Date: Wed, 10 Aug 2022 06:49:05 -0400 Subject: [PATCH] Add Ubuntu 22.04 support --- REFERENCE.md | 2 +- data/os/Ubuntu.22.04.yaml | 1 + manifests/init.pp | 2 +- metadata.json | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 data/os/Ubuntu.22.04.yaml diff --git a/REFERENCE.md b/REFERENCE.md index b27e10dc..fd2cf396 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -311,7 +311,7 @@ Default value: `false` ##### `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 new file mode 100644 index 00000000..468ee4de --- /dev/null +++ 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 index 5406cc3c..1bf7a992 100644 --- 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 index a886edf4..7f335cfc 100644 --- a/metadata.json +++ b/metadata.json @@ -31,7 +31,8 @@ "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "18.04", - "20.04" + "20.04", + "22.04" ] } ],