Skip to content
This repository was archived by the owner on Mar 28, 2019. It is now read-only.

Puppetserver support (third try) #200

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Puppetserver support (third try) #200

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9da1994
Add basic rspec-puppet tests for puppetserver
Mar 21, 2015
9a648fe
Add beaker tests for puppetserver functionality
Mar 21, 2015
b02a285
add puppetserver-specific items to params.pp
Mar 21, 2015
b37e827
Add basic puppetserver support
Mar 21, 2015
3ba358c
Set puppetserver_maxpermsize conditionally
Mar 21, 2015
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
Prev Previous commit
Next Next commit
add puppetserver-specific items to params.pp
  • Loading branch information
Daniel Dreier committed Mar 21, 2015
commit b02a285ee8a228efe3574c745ceb2bbc7a1acd7f
74 changes: 41 additions & 33 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,42 +85,50 @@
}

$default_value = {
agent_package => 'puppet',
agent_service => 'puppet',
agent_service_conf => '/etc/default/puppet',
default_method => 'cron',
master_package => 'puppetmaster',
master_service => 'puppetmaster',
puppet_cmd => '/usr/bin/puppet',
puppet_conf => '/etc/puppet/puppet.conf',
puppet_confdir => '/etc/puppet',
puppet_logdir => '/var/log/puppet',
puppet_rundir => '/var/run/puppet',
puppet_ssldir => '/var/lib/puppet/ssl',
puppet_user => 'puppet',
puppet_group => 'puppet',
puppet_vardir => '/var/lib/puppet',
report_dir => '/usr/lib/ruby/vendor_ruby/puppet/reports',
agent_package => 'puppet',
agent_service => 'puppet',
agent_service_conf => '/etc/default/puppet',
default_method => 'cron',
master_package => 'puppetmaster',
master_service => 'puppetmaster',
puppet_cmd => '/usr/bin/puppet',
puppet_conf => '/etc/puppet/puppet.conf',
puppet_confdir => '/etc/puppet',
puppet_group => 'puppet',
puppet_logdir => '/var/log/puppet',
puppet_rundir => '/var/run/puppet',
puppet_ssldir => '/var/lib/puppet/ssl',
puppet_user => 'puppet',
puppet_vardir => '/var/lib/puppet',
puppetserver_bootstrap_conf => '/etc/puppetserver/bootstrap.cfg',
report_dir => '/usr/lib/ruby/vendor_ruby/puppet/reports',
server_package => 'puppetserver',
server_service => 'puppetserver',
server_service_conf => '/etc/default/puppetserver',
}

$merged_values = merge($default_value, $os_specific)

$agent_package = $merged_values[agent_package]
$agent_service = $merged_values[agent_service]
$agent_service_conf = $merged_values[agent_service_conf]
$agent_use = $merged_values[agent_use]
$default_method = $merged_values[default_method]
$master_package = $merged_values[master_package]
$master_service = $merged_values[master_service]
$master_use = $merged_values[master_use]
$puppet_cmd = $merged_values[puppet_cmd]
$puppet_conf = $merged_values[puppet_conf]
$puppet_confdir = $merged_values[puppet_confdir]
$puppet_group = $merged_values[puppet_group]
$puppet_logdir = $merged_values[puppet_logdir]
$puppet_rundir = $merged_values[puppet_rundir]
$puppet_ssldir = $merged_values[puppet_ssldir]
$puppet_user = $merged_values[puppet_user]
$puppet_vardir = $merged_values[puppet_vardir]
$agent_package = $merged_values[agent_package]
$agent_service = $merged_values[agent_service]
$agent_service_conf = $merged_values[agent_service_conf]
$agent_use = $merged_values[agent_use]
$default_method = $merged_values[default_method]
$master_package = $merged_values[master_package]
$master_service = $merged_values[master_service]
$master_use = $merged_values[master_use]
$puppet_cmd = $merged_values[puppet_cmd]
$puppet_conf = $merged_values[puppet_conf]
$puppet_confdir = $merged_values[puppet_confdir]
$puppet_group = $merged_values[puppet_group]
$puppet_logdir = $merged_values[puppet_logdir]
$puppet_rundir = $merged_values[puppet_rundir]
$puppet_ssldir = $merged_values[puppet_ssldir]
$puppet_user = $merged_values[puppet_user]
$puppet_vardir = $merged_values[puppet_vardir]
$puppetserver_bootstrap_conf = $merged_values[puppetserver_bootstrap_conf]
$server_package = $merged_values[server_package]
$server_service = $merged_values[server_service]
$server_service_conf = $merged_values[server_service_conf]

}