From: Peter Palfrader Date: Sun, 24 Mar 2013 22:55:13 +0000 (+0100) Subject: truncate volumes from a script X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=76646956da694b823088a432d649824702b18fb1 truncate volumes from a script --- diff --git a/modules/bacula/files/bacula-volume-purge-action b/modules/bacula/files/bacula-volume-purge-action new file mode 100755 index 00000000..03c0822e --- /dev/null +++ b/modules/bacula/files/bacula-volume-purge-action @@ -0,0 +1,62 @@ +#!/usr/bin/python + +# sends purge volume action=all to bacula using bconsole. +# list of storages is read from stdin + +# Copyright 2013 Peter Palfrader +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +import optparse +import subprocess +import sys + + +parser = optparse.OptionParser() +parser.set_usage("%prog [options]") +parser.add_option("-v", "--verbose", dest="verbose", + default=False, action="store_true", + help="Be more verbose.") +(options, args) = parser.parse_args() + +if len(args) >= 1: + parser.print_help() + sys.exit(1) + +cmd = [] +for storage in sys.stdin: + s = storage.rstrip() + c = 'purge volume action=all allpools storage=%s'%(s,) + cmd.append(c) +if options.verbose: + for c in cmd: + print "Will run: %s"%(c,) + +p = subprocess.Popen(['bconsole'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +(out, err) = p.communicate("\n".join(cmd)) +if p.returncode != 0: + raise Exception("bconsole failed. stdout:\n%s\nstderr:%s\n"%(out, err)) + +if options.verbose: + print "stdout:\n%s"%(out,) + +if err != "": + print >> sys.stderr, "bconsole said on stderr:\n%s\n"%(err,) + sys.exit(1) diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp index 0afd927f..818cfd6f 100644 --- a/modules/bacula/manifests/director.pp +++ b/modules/bacula/manifests/director.pp @@ -62,4 +62,22 @@ class bacula::director inherits bacula { group => bacula, require => Package['bacula-console'] } + + file { '/etc/bacula/bacula-volume-purge-action': + mode => '0555', + source => 'puppet:///modules/bacula/bacula-volume-purge-action', + ; + } + file { '/etc/bacula/storages-list.d': + ensure => directory, + mode => '0755', + group => bacula, + purge => true, + force => true, + recurse => true, + source => 'puppet:///files/empty/', + } + file { "/etc/cron.d/tor-bacula-stuff": + content => "@daily root (cat /etc/bacula/storages-list.d/*.storage; echo '$bacula::bacula_filestor_name-catalog') | /etc/bacula/bacula-volume-purge-action\n"; + } } diff --git a/modules/bacula/manifests/node.pp b/modules/bacula/manifests/node.pp index 5552627a..f105d5c0 100644 --- a/modules/bacula/manifests/node.pp +++ b/modules/bacula/manifests/node.pp @@ -24,5 +24,12 @@ define bacula::node() { group => bacula, notify => Exec['bacula-director reload'] } + + file { "/etc/bacula/storages-list.d/${name}.storage": + content => "$bacula::bacula_filestor_device-$client\n", + mode => '0440', + group => bacula, + notify => Exec['bacula-director reload'] + } } diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb index 9132a553..3ceb660b 100644 --- a/modules/bacula/templates/bacula-dir.conf.erb +++ b/modules/bacula/templates/bacula-dir.conf.erb @@ -242,11 +242,6 @@ Job { Write Bootstrap = "/var/lib/bacula/%n.bsr" Priority = 15 # run after main backup Pool = "poolcatalog-<%=bacula_pool_name%>" - RunScript { - RunsWhen=After - RunsOnClient=No - Console = "purge volume action=all allpools storage=%w" - } } ######################################################################## diff --git a/modules/bacula/templates/per-client.conf.erb b/modules/bacula/templates/per-client.conf.erb index 7da723a5..1755e62e 100644 --- a/modules/bacula/templates/per-client.conf.erb +++ b/modules/bacula/templates/per-client.conf.erb @@ -20,12 +20,6 @@ Job { Cancel Lower Level Duplicates = yes Cancel Queued Duplicates = yes - - RunScript { - RunsWhen = After - RunsOnClient = No - Console = "purge volume action=all allpools storage=%w" - } } # Client (File Services) to backup