diff options
author | Micah <micah@riseup.net> | 2015-03-01 00:34:37 +0000 |
---|---|---|
committer | Micah <micah@riseup.net> | 2015-03-01 00:34:37 +0000 |
commit | 70d2dd696696b14c5011580f994c6520b028f32a (patch) | |
tree | acd91c59fea86768f81d98e262ed1677f646fa47 /manifests/master/hasdb/mysql.pp | |
parent | beae5a608dd1b1d370917896d853a6b53ad73a45 (diff) | |
parent | 0bb70b28a7c7679d0e07fd75230d40203c0d53b5 (diff) |
Merge branch 'merge_immerda' into 'master'
Merge immerda's changes
GENERAL CHANGES
* Now uses parameterized classes
* Deprecates all top-scope "$puppet_*" variables
* File source path changed from "site-puppet" to "site_puppet"
master/puppet.conf
* [main] default vardir changed /srv/puppet to /var/lib/puppet
* [main] plugindest removed
* [agent] logdest removed
* [environments] removed
base.pp
* new $puppet::config, $puppet::config_content
cron/base.pp
* new $puppet::cron::cron_time, $puppet::http_compression, $puppet::cron::stop_service
cron.pp
* new puppet::cron parameterized class
debian.pp
* $puppet_ensure_version now $puppet::ensure_version
init.pp
* new puppet parameteried class
* $use_shorewall deprecated
linux.pp
* $facter_ensure_version now $puppet::facter_ensure_version
master/linux.pp
* $puppetmaster_mode changed to $puppet::master::mode
* does not require apache::base
master
* class puppet:puppetmaster::* renamed puppet::master::*
* $puppet_fileserverconfig changed to $puppet::master::fileserver
* added $puppet::master::config_content
* $puppetmaster_storeconfigs changed to $puppet::master::storeconfigs
master/lastruncheck.pp
* $::puppet_lastruncheck_ignorehosts changed to $puppet::master::lastruncheck_ignorehosts
* $::puppet_lastruncheck_ignorehosts_str changed to $puppet::master::lastruncheck_ignorehosts_str
* $::puppet_lastruncheck_timeout_str changed to $puppet::master::lastruncheck_timeout_str
* does not include cron
* /etc/cron.d/puppetlast command changed
master/cleanupreports
* $puppetmaster_cleanup_reports[_dir] changed to $puppet::master::reports[_dir]
* cron filename changed
master/passenger
* does not install puppetmaster-passenger package on Debian anymore
* restart mechanism by creating /etc/puppet/rack/tmp/restart.txt
* does not manage /usr/share/puppet/rack/puppetmasterd/config.ru anymore, config.ru expected at /etc/puppet/rack (check your Apache configs)
See merge request !1
Diffstat (limited to 'manifests/master/hasdb/mysql.pp')
-rw-r--r-- | manifests/master/hasdb/mysql.pp | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/manifests/master/hasdb/mysql.pp b/manifests/master/hasdb/mysql.pp new file mode 100644 index 0000000..5f4985a --- /dev/null +++ b/manifests/master/hasdb/mysql.pp @@ -0,0 +1,32 @@ +# don't use this define use the general interface +define puppet::master::hasdb::mysql ( + $dbname = 'puppet', + $dbhost = 'localhost', + $dbhostfqdn = $::fqdn, + $dbuser = 'puppet', + $dbpwd, + $dbconnectinghost = 'localhost' ) +{ + @@mysql_database { $dbname: + tag => "mysql_${dbhostfqdn}", + } + + @@mysql_user { "${dbuser}@${dbconnectinghost}": + password_hash => mysql_password("$dbpwd"), + require => Mysql_database[$dbname], + tag => "mysql_${dbhostfqdn}", + } + + @@mysql_grant { "${dbuser}@${dbconnectinghost}/${dbname}": + privileges => all, + require => Mysql_user["${dbuser}@${dbconnectinghost}"], + tag => "mysql_${dbhostfqdn}", + } + + if $puppet::master::manage_munin { + munin::plugin::deploy { 'puppetresources': + source => "puppet/munin/puppetresources.mysql", + config => "env.mysqlopts --user=$dbuser --password=$dbpwd -h $dbhost\nenv.puppetdb $dbname", + } + } +} |