Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add some new config parameters #92

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ The following parameters are available in the `hdm` class:
* [`ldap_settings`](#-hdm--ldap_settings)
* [`ldap_bind_dn_password`](#-hdm--ldap_bind_dn_password)
* [`hdm_hiera_config_file`](#-hdm--hdm_hiera_config_file)
* [`puppet_dir`](#-hdm--puppet_dir)
* [`global_hiera_yaml`](#-hdm--global_hiera_yaml)
* [`custom_lookup_function`](#-hdm--custom_lookup_function)

##### <a name="-hdm--method"></a>`method`
Expand Down Expand Up @@ -322,6 +324,22 @@ want HDM to not use hiera.yaml.

Default value: `'hiera.yaml'`

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

Data type: `Stdlib::Unixpath`

Path to the complete puppet dir

Default value: `'/etc/puppetlabs'`

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

Data type: `Stdlib::Unixpath`

Absolute path to global hiera.yaml file

Default value: `'/etc/puppetlabs/puppet/hiera.yaml'`

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

Data type: `Hash[String[1],Enum['yaml', 'eyaml']]`
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
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