Andrew Bogott has submitted this change and it was merged.
Change subject: replace $::instanceproject with $::labsproject
......................................................................
replace $::instanceproject with $::labsproject
They should have the same value, but $::instanceproject comes from
ldap and $::labsproject from instance metadata.
Bug: T93684
Change-Id: I9c5d18d28a6969d99dc4ba591ddda2b6f80f4893
---
M manifests/role/labs.pp
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Tim Landscheidt: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 423bded..472be6a 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -47,10 +47,10 @@
$nfs_server = 'labstore.svc.eqiad.wmnet'
$dumps_server = 'labstore1003.eqiad.wmnet'
- if mount_nfs_volume($::instanceproject, 'home') {
+ if mount_nfs_volume($::labsproject, 'home') {
# Note that this is the same export as for /data/project
exec { 'block-for-home-export':
- command => "/usr/local/sbin/block-for-export ${nfs_server}
project/${::instanceproject} 180",
+ command => "/usr/local/sbin/block-for-export ${nfs_server}
project/${::labsproject} 180",
require => [File['/etc/modprobe.d/nfs-no-idmap'],
File['/usr/local/sbin/block-for-export']],
unless => '/bin/mountpoint -q /home',
}
@@ -65,7 +65,7 @@
}
}
- if mount_nfs_volume($::instanceproject, 'project') or
mount_nfs_volume($::instanceproject, 'scratch') {
+ if mount_nfs_volume($::labsproject, 'project') or
mount_nfs_volume($::labsproject, 'scratch') {
# Directory for data mounts
file { '/data':
ensure => directory,
@@ -75,9 +75,9 @@
}
}
- if mount_nfs_volume($::instanceproject, 'project') {
+ if mount_nfs_volume($::labsproject, 'project') {
exec { 'block-for-project-export':
- command => "/usr/local/sbin/block-for-export ${nfs_server}
project/${::instanceproject} 180",
+ command => "/usr/local/sbin/block-for-export ${nfs_server}
project/${::labsproject} 180",
require => [File['/etc/modprobe.d/nfs-no-idmap'],
File['/usr/local/sbin/block-for-export']],
unless => '/bin/mountpoint -q /data/project',
}
@@ -97,7 +97,7 @@
}
}
- if mount_nfs_volume($::instanceproject, 'scratch') {
+ if mount_nfs_volume($::labsproject, 'scratch') {
# We don't need to block for this one because it's always exported for
everyone.
file { '/data/scratch':
ensure => directory,
@@ -114,7 +114,7 @@
}
}
- if mount_nfs_volume($::instanceproject, 'dumps') or
mount_nfs_volume($::instanceproject, 'statistics') {
+ if mount_nfs_volume($::labsproject, 'dumps') or
mount_nfs_volume($::labsproject, 'statistics') {
# Directory for public (readonly) mounts
file { '/public':
ensure => directory,
@@ -125,7 +125,7 @@
}
- if mount_nfs_volume($::instanceproject, 'statistics') {
+ if mount_nfs_volume($::labsproject, 'statistics') {
file { '/public/statistics':
ensure => directory,
require => File['/public'],
@@ -141,7 +141,7 @@
}
}
- if mount_nfs_volume($::instanceproject, 'dumps') {
+ if mount_nfs_volume($::labsproject, 'dumps') {
file { '/public/dumps':
ensure => directory,
require => File['/public'],
--
To view, visit https://gerrit.wikimedia.org/r/230652
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c5d18d28a6969d99dc4ba591ddda2b6f80f4893
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
