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

1 files changed, 0 insertions, 32 deletions

diff --git a/manifests/puppetmaster/hasdb/mysql.pp b/manifests/puppetmaster/hasdb/mysql.pp
deleted file mode 100644
index 1ed122a..0000000
--- a/manifests/puppetmaster/hasdb/mysql.pp
+++ /dev/null
@@ -1,32 +0,0 @@
-# don't use this define use the general interface
-define puppet::puppetmaster::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 $use_munin {
-    munin::plugin::deploy { 'puppetresources':
-      source => "puppet/munin/puppetresources.mysql",
-      config => "env.mysqlopts --user=$dbuser --password=$dbpwd -h $dbhost\nenv.puppetdb $dbname",
-    }
-  }
-}