tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added initial support for MySQL and PostgreSQL database for storeconfigs

Browse source
This commit is contained in:
Ossi Salmi 2012-06-05 16:26:21 +03:00
parent 6f5f738833
commit 5d4ce37211
2 changed files with 44 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

33
puppet/manifests/init.pp
View file

@ -173,6 +173,21 @@ class puppet::server {
# Store config type to use. Valid values are "thin", "full" and "none".
# Defaults to "thin".
#
# $puppet_dbadapter:
# Database adapter to use. Defaults to "sqlite3".
#
# $puppet_dbserver:
# Database server address. Defaults to "localhost".
#
# $puppet_dbname:
# Database name. Defaults to "puppet".
#
# $puppet_dbuser:
# Database user name. Defaults to "puppet".
#
# $puppet_dbpassword:
# Database password.
#
# $puppet_report_maxage:
# Maximum age (in hours) to keep reports. Defaults to 720 hours (30 days).
#
@ -197,6 +212,24 @@ class puppet::server::common inherits puppet::client {
}
}
if !$puppet_dbadapter {
$puppet_dbadapter = "sqlite3"
}
if $puppet_dbadapter != "sqlite3" {
if !$puppet_dbserver {
$puppet_dbserver = "localhost"
}
if !$puppet_dbname {
$puppet_dbname = "puppet"
}
if !$puppet_dbuser {
$puppet_dbuser = "puppet"
}
if !$puppet_dbpassword {
fail("\$puppet_dbpassword must be set when using ${puppet_dbadapter}.")
}
}
package { "puppetmaster":
name => $operatingsystem ? {
debian => "puppetmaster",