Akosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/83071
Change subject: Create a definition to facilidate backup sets
......................................................................
Create a definition to facilidate backup sets
This creates a definition to facilitate defining backup sets without
having duplicate class definitions. In the same commit it is used in
puppetmaster to resolve a duplicate definition
Change-Id: I574bf9822df7f6de95472ac516cd05856fffd266
---
M manifests/backups.pp
M manifests/puppetmaster.pp
2 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/83071/1
diff --git a/manifests/backups.pp b/manifests/backups.pp
index b83c6a7..ed0efd3 100644
--- a/manifests/backups.pp
+++ b/manifests/backups.pp
@@ -3,6 +3,12 @@
# Transitioning to bacula stanzas
+define backup::set {
+ @backup::host::sets { "${name}":
+ jobdefaults => $backup::host::jobdefaults,
+ }
+}
+
class backup::host($sets, $pool='production') {
include role::backup::config
@@ -23,6 +29,10 @@
backup::host::sets { $sets:
jobdefaults => $jobdefaults,
}
+
+ Backup::Host::Sets <| |> {
+ require => Class['bacula::client'],
+ }
}
class backup::mysqlhost($xtrabackup=true, $per_db=false, $innodb_only=false) {
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index 26622cc..44486ee 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -36,9 +36,7 @@
ensure => 'latest',
}
- class { 'backup::host':
- sets => [ 'var-lib-puppet-ssl', ]
- }
+ backup::set { 'var-lib-puppet-ssl': }
class ssl($server_name="puppet", $ca="false") {
$ssldir = "/var/lib/puppet/server/ssl"
--
To view, visit https://gerrit.wikimedia.org/r/83071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I574bf9822df7f6de95472ac516cd05856fffd266
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
