bye bye storeconfigs

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

diff --git a/manifests/site.pp b/manifests/site.pp
index a504ecbc1b84cc32eb1c9e7a0e45e47da4a51c09..f75f0f87943468e91863492fbaee6ea67825d921 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -46,7 +46,6 @@ node default {
 
        if $::hostname in [berlioz, biber, draghi] {
                include bacula::client
-               @@bacula::node { $::fqdn: }
        }
 
        if $::hostname == 'beethoven' {

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 368a381942a11ab6449b3889a013800bcbec4c46..d0c06de087caf98d800b1508c8689af53c97a70a 100644 (file)
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -22,8 +22,6 @@ class bacula::director inherits bacula {
                notify  => Service['bacula-director']
        }
 
-       Bacula::Node<<| |>>
-
        file { '/etc/bacula/bacula-dir.conf':
                content => template('bacula/bacula-dir.conf.erb'),
                mode    => '0440',
@@ -37,4 +35,8 @@ class bacula::director inherits bacula {
                description => 'Allow bacula access from localhost',
                rule        => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_address} localhost) ACCEPT",
        }
+
+       $clients = ['berlioz.debian.org', 'biber.debian.org', 'draghi.debian.org']
+       bacula::node { $clients: }
+
 }

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