Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/180805
Change subject: Permanent mountpoints for heze/helium bacula SDs
......................................................................
Permanent mountpoints for heze/helium bacula SDs
Migrate helium to the DAS as well removing the temporary workaround
Change-Id: I63e7ba620ee0a663ef75c373f6d124929abce16a
---
M manifests/role/backup.pp
1 file changed, 11 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/180805/1
diff --git a/manifests/role/backup.pp b/manifests/role/backup.pp
index 95f54d7..d96485e 100644
--- a/manifests/role/backup.pp
+++ b/manifests/role/backup.pp
@@ -237,38 +237,18 @@
system::role { 'role::backup::storage': description => 'Backup Storage' }
- # TODO: Temporary workaround while migrating from the netapp to DAS
- if $::hostname == 'helium' {
- include nfs::netapp::common
- mount { '/srv/baculasd1' :
- ensure => mounted,
- device => "${nfs::netapp::common::device}:/vol/baculasd1",
- fstype => 'nfs',
- options => "${nfs::netapp::common::options},rw",
- require => File['/srv/baculasd1'],
- }
+ mount { '/srv/baculasd1' :
+ ensure => mounted,
+ device => '/dev/mapper/bacula-baculasd1',
+ fstype => 'ext4',
+ require => File['/srv/baculasd1'],
+ }
- mount { '/srv/baculasd2' :
- ensure => mounted,
- device => "${nfs::netapp::common::device}:/vol/baculasd2",
- fstype => 'nfs',
- options => "${nfs::netapp::common::options},rw",
- require => File['/srv/baculasd2'],
- }
- } else {
- mount { '/srv/baculasd1' :
- ensure => mounted,
- device => '/dev/mapper/bacula-baculasd1',
- fstype => 'ext4',
- require => File['/srv/baculasd1'],
- }
-
- mount { '/srv/baculasd2' :
- ensure => mounted,
- device => '/dev/mapper/bacula-baculasd2',
- fstype => 'ext4',
- require => File['/srv/baculasd2'],
- }
+ mount { '/srv/baculasd2' :
+ ensure => mounted,
+ device => '/dev/mapper/bacula-baculasd2',
+ fstype => 'ext4',
+ require => File['/srv/baculasd2'],
}
class { 'bacula::storage':
--
To view, visit https://gerrit.wikimedia.org/r/180805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I63e7ba620ee0a663ef75c373f6d124929abce16a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
