Skip to content

Commit e1a7217

Browse files
committed
Remove hardcoded mem settings from default pe.conf
A long time ago these settings were added to faciliate local development on VirtualBox, using developer workstations. We should not provide different memory defaults for PE installs than what is provided by PE itself. Additional fix: found Puppet Strings bug which prevented generating a REFERENCE.md file. It is now possible to use Puppet Strings to generate a REFERENCE.md.
1 parent 1f33dd2 commit e1a7217

File tree

1 file changed

+23
-21
lines changed

1 file changed

+23
-21
lines changed

functions/generate_pe_conf.pp

+23-21
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
# Generates a pe.conf file, removing undef parameters
1+
# @summary Generate a pe.conf file in JSON format
22
#
3-
# @param user_settings
3+
# @param settings
44
# A hash of settings to set in the config file. Any keys that are set to
5-
# undef will not be included in the config file. This is done to reduce the
6-
# amount of logic required within plans if parameters are not passed in.
5+
# undef will not be included in the config file.
76
#
87
function peadm::generate_pe_conf (
98
Hash $settings,
10-
) {
9+
) >> String {
1110
# Check that console_admin_password is present
1211
unless $settings['console_admin_password'] =~ String {
1312
fail('pe.conf must have the console_admin_password set')
@@ -16,23 +15,26 @@ function peadm::generate_pe_conf (
1615
# Define the configuration settings that will be placed in pe.conf by
1716
# default. These can be overriden by user-supplied values in the $settings
1817
# hash.
18+
#
19+
# At this time, there are no defaults which need to be modified from the
20+
# out-of-box defaults.
1921
$defaults = {
20-
'puppet_enterprise::profile::master::java_args' => {
21-
'Xmx' => '2048m',
22-
'Xms' => '512m',
23-
},
24-
'puppet_enterprise::profile::console::java_args' => {
25-
'Xmx' => '768m',
26-
'Xms' => '256m',
27-
},
28-
'puppet_enterprise::profile::orchestrator::java_args' => {
29-
'Xmx' => '768m',
30-
'Xms' => '256m',
31-
},
32-
'puppet_enterprise::profile::puppetdb::java_args' => {
33-
'Xmx' => '768m',
34-
'Xms' => '256m',
35-
},
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+
# },
3638
}
3739

3840
# Merge the defaults with user-supplied settings, remove anything that is

0 commit comments

Comments
 (0)