Skip to content

Commit 065e8e1

Browse files
committed
Remove defaults code in generate_pe_conf
Removing for now as there is no need to set peadm-coded default pe.conf configuration values. To restore the ability to inject defaults into generated pe.conf files, revert this commit.
1 parent e1a7217 commit 065e8e1

File tree

1 file changed

+3
-29
lines changed

1 file changed

+3
-29
lines changed

Diff for: functions/generate_pe_conf.pp

+3-29
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,9 @@ function peadm::generate_pe_conf (
1212
fail('pe.conf must have the console_admin_password set')
1313
}
1414

15-
# Define the configuration settings that will be placed in pe.conf by
16-
# default. These can be overriden by user-supplied values in the $settings
17-
# hash.
18-
#
19-
# At this time, there are no defaults which need to be modified from the
20-
# out-of-box defaults.
21-
$defaults = {
22-
# 'puppet_enterprise::profile::master::java_args' => {
23-
# 'Xmx' => '2048m',
24-
# 'Xms' => '512m',
25-
# },
26-
# 'puppet_enterprise::profile::console::java_args' => {
27-
# 'Xmx' => '768m',
28-
# 'Xms' => '256m',
29-
# },
30-
# 'puppet_enterprise::profile::orchestrator::java_args' => {
31-
# 'Xmx' => '768m',
32-
# 'Xms' => '256m',
33-
# },
34-
# 'puppet_enterprise::profile::puppetdb::java_args' => {
35-
# 'Xmx' => '768m',
36-
# 'Xms' => '256m',
37-
# },
38-
}
39-
40-
# Merge the defaults with user-supplied settings, remove anything that is
41-
# undef, then output to JSON (and therefore HOCON, because HOCON is a
42-
# superset of JSON)
43-
($defaults + $settings).filter |$key,$value| {
15+
# Remove anything that is undef, then output to JSON (and therefore HOCON,
16+
# because HOCON is a superset of JSON)
17+
$settings.filter |$key,$value| {
4418
$value != undef
4519
}.to_json_pretty()
4620
}

0 commit comments

Comments
 (0)