coren has submitted this change and it was merged.
Change subject: beta: on eqiad mount /srv using labs_lvm
......................................................................
beta: on eqiad mount /srv using labs_lvm
There is no /dev/vdb on eqiad labs, we need to use lvm to create a
partition for us.
/srv is/will be used by git-deploy/Trebuchet/Sartoris..
Change-Id: I6d6670db766c381e8a5915415cfa464445f73e42
---
M manifests/role/applicationserver.pp
1 file changed, 19 insertions(+), 12 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/applicationserver.pp
b/manifests/role/applicationserver.pp
index d6de9d9..940acc9 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -66,19 +66,26 @@
if $::realm == 'labs' {
# MediaWiki configuration specific to labs instances
('beta' project)
class { "mediawiki": twemproxy => false }
- # Umount /dev/vdb from /mnt ...
- mount { '/mnt':
- name => '/mnt',
- ensure => absent,
- }
- # ... and mount it on /srv
- mount { '/srv':
- ensure => mounted,
- device => '/dev/vdb',
- fstype => 'auto',
- options =>
'defaults,nobootwait,comment=cloudconfig',
- require => Mount['/mnt'],
+ if $::site == 'pmtpa' {
+ # Umount /dev/vdb from /mnt ...
+ mount { '/mnt':
+ name => '/mnt',
+ ensure => absent,
+ }
+
+ # ... and mount it on /srv
+ mount { '/srv':
+ ensure => mounted,
+ device => '/dev/vdb',
+ fstype => 'auto',
+ options =>
'defaults,nobootwait,comment=cloudconfig',
+ require => Mount['/mnt'],
+ }
+ } elsif $::site == 'eqiad' {
+ # Does not come with /dev/vdb, we need to mount
it using lvm
+ include labs_lvm
+ labs_lvm::volume { 'second-local-disk': mountat
=> '/srv' }
}
# Include HHVM for testing
--
To view, visit https://gerrit.wikimedia.org/r/116987
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6d6670db766c381e8a5915415cfa464445f73e42
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
