try thin_storeconfigs

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/.gitignore b/.gitignore
index ca0749db56daeb4c17ff3615852f82769d36c7af..7d2e5d6c900fe1804c49e450389278a45880c11e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,6 @@ modules/exim/files/certs/
 modules/ssl/files/
 modules/dacs/files/private
 modules/hiera-puppet
+modules/puppetmaster/manifests/db.pp
 *.swp
 *~

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 5258dfbe6b54aa6e365806d432a77886d6405a77..a12ce2d91d7c76f34b5726d9c983d4f14bb1d0c9 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -154,6 +154,10 @@ class debian-org {
                source => 'puppet:///modules/debian-org/timezone',
                notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
        }
+       if $::hostname == handel {
+               include puppetmaster::db
+               $dbpassword = $puppetmaster::db::password
+       }
        file { '/etc/puppet/puppet.conf':
                content => template('debian-org/puppet.conf.erb'),
        }

diff --git a/modules/debian-org/templates/puppet.conf.erb b/modules/debian-org/templates/puppet.conf.erb
index db558f0a4cccf78ccf23a62a8c65e2af2809ba4b..f4d97ac98f1d0f1e5de86e53117ecfbc0deed6da 100644 (file)
--- a/modules/debian-org/templates/puppet.conf.erb
+++ b/modules/debian-org/templates/puppet.conf.erb
@@ -19,6 +19,11 @@ environments = development,testing,production,staging
 reports = store, http
 reporturl = http://puppet-dashboard.debian.org:3000/reports/upload
 config_version = cat /etc/puppet/.config-version
+thin_storeconfigs = true
+dbadapter=mysql
+dbuser=puppet
+dbpassword=<% scope.lookupvar('dbpassword') %>
+dbserver=localhost
 <%- end -%>
 
 [agent]