Skip to content

Commit

Permalink
Update HDM (#96)
Browse files Browse the repository at this point in the history
* Update HDM

- HDM can now read global yaml data (puppet_dir)
- Update supported OS

* update reference
  • Loading branch information
tuxmea authored Nov 1, 2024
1 parent 17ce84c commit 4254edf
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 8 deletions.
13 changes: 12 additions & 1 deletion REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ The following parameters are available in the `hdm` class:
* [`user`](#-hdm--user)
* [`group`](#-hdm--group)
* [`puppetdb_settings`](#-hdm--puppetdb_settings)
* [`puppet_dir`](#-hdm--puppet_dir)
* [`puppet_code_dir`](#-hdm--puppet_code_dir)
* [`disable_authentication`](#-hdm--disable_authentication)
* [`allow_encryption`](#-hdm--allow_encryption)
Expand Down Expand Up @@ -97,7 +98,7 @@ Version is the image tag name when using docker and
the git tag when using rvm
Please find the releases on HDM website: https://github.com/betadots/hdm/releases

Default value: `'2.1.0'`
Default value: `'3.0.0'`

##### <a name="-hdm--container_registry_url"></a>`container_registry_url`

Expand Down Expand Up @@ -224,6 +225,16 @@ Using SSL cert:

Default value: `{ 'server' => 'http://localhost:8080', }`

##### <a name="-hdm--puppet_dir"></a>`puppet_dir`

Data type: `Stdlib::Unixpath`

The path where HDM can find the global
hiera.yaml file
defaults to '/etc/puppetlabs'

Default value: `'/etc/puppetlabs'`

##### <a name="-hdm--puppet_code_dir"></a>`puppet_code_dir`

Data type: `Stdlib::Unixpath`
Expand Down
2 changes: 1 addition & 1 deletion manifests/docker.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
7 changes: 6 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
14 changes: 9 additions & 5 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -42,7 +42,8 @@
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"7",
"8"
"8",
"9"
]
},
{
Expand All @@ -55,7 +56,8 @@
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"8"
"8",
"9"
]
},
{
Expand All @@ -68,14 +70,16 @@
"operatingsystem": "Debian",
"operatingsystemrelease": [
"10",
"11"
"11",
"12"
]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"18.04",
"20.04"
"20.04",
"22.04"
]
},
{
Expand Down

0 comments on commit 4254edf

Please sign in to comment.