Akosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79334
Change subject: helium backup director/storage server
......................................................................
helium backup director/storage server
Change-Id: I6db35aa15cb800b4dc917a60099baacff486e7a3
---
M manifests/role/backup.pp
M manifests/site.pp
2 files changed, 40 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/34/79334/1
diff --git a/manifests/role/backup.pp b/manifests/role/backup.pp
index b881de4..4b1f39b 100644
--- a/manifests/role/backup.pp
+++ b/manifests/role/backup.pp
@@ -1,7 +1,7 @@
# A set of roles for the backup director, storage and client as they are
# configured in WMF
-$director = "FILLMEIN"
+$director = "helium.eqiad.wmnet"
class role::backup::director {
system_role { "role::backup::director": description => "Primary Backup
server" }
@@ -92,16 +92,50 @@
class role::backup::storage() {
system_role { "role::backup::storage": description => "Storage backup
server" }
+ include nfs::netapp::common
+
class { 'bacula::storage':
director => $director,
sd_max_concur_jobs => 5,
sqlvariant => 'mysql',
}
- bacula::storage::device { 'FileStorage':
+ file { [ '/srv/bacula-sd1',
+ '/srv/bacula-sd2' ]:
+ ensure => directory,
+ owner => bacula,
+ group => bacula,
+ mode => '0660',
+ require => Class['bacula::storage'],
+ }
+
+ mount { "/srv/bacula-sd1" :
+ ensure => mounted,
+ device => "${nfs::netapp::common::device}:/vol/bacula-sd1",
+ fstype => "nfs",
+ options => "${nfs::netapp::common::options},rw",
+ require => File['/srv/bacula-sd1'],
+ }
+
+ mount { "/srv/bacula-sd2" :
+ ensure => mounted,
+ device => "${nfs::netapp::common::device}:/vol/bacula-sd2",
+ fstype => "nfs",
+ options => "${nfs::netapp::common::options},rw",
+ require => File['/srv/bacula-sd2'],
+ }
+
+ bacula::storage::device { 'FileStorage2':
device_type => 'File',
media_type => 'File',
- archive_device => '/srv/backups',
+ archive_device => '/srv/bacula-sd2',
+ max_concur_jobs => 2,
+ }
+
+ bacula::storage::device { 'FileStorage1':
+ device_type => 'File',
+ media_type => 'File',
+ archive_device => '/srv/bacula-sd1',
max_concur_jobs => 2,
}
}
diff --git a/manifests/site.pp b/manifests/site.pp
index a0487ff..d01311a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1037,7 +1037,9 @@
node "helium.eqiad.wmnet" {
include standard,
- role::poolcounter
+ role::poolcounter,
+ role::backup::director,
+ role::backup::storage
}
node "holmium.wikimedia.org" {
--
To view, visit https://gerrit.wikimedia.org/r/79334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6db35aa15cb800b4dc917a60099baacff486e7a3
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
