Skip to content

Commit

Permalink
Add some new config parameters
Browse files Browse the repository at this point in the history
volume mount changes from /etc/puppetlabs/code to /etc/puppetlabs to
allow reading global hier adata
  • Loading branch information
tuxmea committed May 23, 2024
1 parent 62f6fb1 commit e5d6462
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
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
6 changes: 6 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@
# @param hdm_hiera_config_file Set to another file if you
# want HDM to not use hiera.yaml.
#
# @param puppet_dir Path to the complete puppet dir
#
# @param global_hiera_yaml Absolute path to global hiera.yaml file
#
# @param custom_lookup_function If you use your own developed hiera
# lookup function, HDM needs to know if the function returns yaml
# or eyaml data.
Expand Down Expand Up @@ -154,6 +158,8 @@
Hdm::Puppetdb $puppetdb_settings = { 'server' => 'http://localhost:8080', },
Stdlib::Unixpath $puppet_code_dir = '/etc/puppetlabs/code',
String[1] $hdm_hiera_config_file = 'hiera.yaml',
Stdlib::Unixpath $global_hiera_yaml = '/etc/puppetlabs/puppet/hiera.yaml',
Stdlib::Unixpath $puppet_dir = '/etc/puppetlabs',
# additional application parameter
Boolean $disable_authentication = false,
Boolean $allow_encryption = false,
Expand Down
1 change: 1 addition & 0 deletions templates/hdm.yml.epp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
hiera_config_file: "<%= $hdm::hdm_hiera_config_file %>"
config_dir: <%= $hdm::puppet_code_dir %>
authentication_disabled: <%= $hdm::disable_authentication %>
global_hiera_yaml: <%= $hdm::global_hiera_yaml %>
<%- if ! $hdm::final_ldap_settings.empty { -%>
ldap:
<%- $hdm::final_ldap_settings.each |$key, $value| { -%>
Expand Down

0 comments on commit e5d6462

Please sign in to comment.