From 293e30c707a09ba192111b8c4a98442caac5e191 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 25 Jun 2012 07:55:01 +0100 Subject: [PATCH] bye bye storeconfigs Signed-off-by: Stephen Gran --- manifests/site.pp | 1 - modules/bacula/manifests/director.pp | 6 ++++-- modules/debian-org/templates/puppet.conf.erb | 5 ----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index a504ecbc..f75f0f87 100644 --- 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 368a3819..d0c06de0 100644 --- 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 81189574..db558f0a 100644 --- 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] -- 2.39.2