Update HDM

- HDM can now read global yaml data (puppet_dir) - Update supported OS
voxpupuli · Oct 25, 2024 · e4c0bce · e4c0bce
1 parent 17ce84c
commit e4c0bce
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/manifests/docker.pp b/manifests/docker.pp
@@ -66,7 +66,7 @@
     ],
     volumes  => [
       "${hdm::hdm_path}:${hdm::hdm_path}",
-      "${hdm::puppet_code_dir}:${hdm::puppet_code_dir}:ro",
+      "${hdm::puppet_dir}:${hdm::puppet_dir}:ro",
       "${hdm::hdm_path}/hdm.yml:/hdm/config/hdm.yml:ro",
       "${hdm::hdm_path}/database.yml:/hdm/config/database.yml:ro",
     ],

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -72,6 +72,10 @@
 #     }
 #   ```
 #
+# @param puppet_dir The path where HDM can find the global
+#   hiera.yaml file
+#   defaults to '/etc/puppetlabs'
+#
 # @param puppet_code_dir The path where HDM can find deployed
 #   Puppet environments (similar to puppet config code_dir)
 #   defaults to '/etc/puppetlabs/code'
@@ -136,7 +140,7 @@
 #
 class hdm (
   # installation parameter
-  String[1]                     $version               = '2.1.0',
+  String[1]                     $version               = '3.0.0',
   Enum['docker', 'rvm']         $method                = 'docker',
   String[1]                     $container_registry_url = 'ghcr.io/betadots/hdm',
   Boolean                       $manage_docker         = true,
@@ -153,6 +157,7 @@
   String[1]                     $git_url               = 'https://github.com/betadots/hdm.git',
   Hdm::Puppetdb                 $puppetdb_settings     = { 'server' => 'http://localhost:8080', },
   Stdlib::Unixpath              $puppet_code_dir       = '/etc/puppetlabs/code',
+  Stdlib::Unixpath              $puppet_dir            = '/etc/puppetlabs',
   String[1]                     $hdm_hiera_config_file = 'hiera.yaml',
   # additional application parameter
   Boolean                        $disable_authentication = false,

diff --git a/metadata.json b/metadata.json
@@ -14,7 +14,7 @@
     },
     {
       "name": "puppetlabs/docker",
-      "version_requirement": ">= 4.4.0 < 10.0.0"
+      "version_requirement": ">= 4.4.0 < 11.0.0"
     },
     {
       "name": "puppetlabs/vcsrepo",
@@ -42,7 +42,8 @@
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
@@ -55,7 +56,8 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
       ]
     },
     {
@@ -68,14 +70,16 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "10",
-        "11"
+        "11",
+        "12"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "18.04",
-        "20.04"
+        "20.04",
+        "22.04"
       ]
     },
     {