ArielGlenn has submitted this change and it was merged.
Change subject: beta: symlink /a/common
......................................................................
beta: symlink /a/common
The multiversion/defines.php does use /a/common which is not existing on
the beta cluster. This patch makes it a symbolic link to the shared
directory.
That also makes puppet ensure /a/common exists in production.
On labs, define /data/project/apache and
/data/project/apache/common-local as belonging to mwdeploy:mwdeploy
Change-Id: Iaf19f0e8cf029cdbbbb2dabe3ae1d07cee417c39
---
M manifests/misc/deployment.pp
1 file changed, 27 insertions(+), 6 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index af7a0cd..d062c07 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -358,20 +358,41 @@
$dblist_common_source = $dblist_common
} elsif $system == "scap" {
$mw_common = "/usr/local/apache/common-local"
- if $::realm == 'production' {
- $mw_common_source = "/a/common"
- } else {
- # For the beta cluster
- $mw_common_source = "/data/project/apache/common-local"
- }
+ $mw_common_source = "/a/common"
$dblist_common = $mw_common
$dblist_common_source = $mw_common_source
}
if $::realm == 'production' {
$mw_rsync_host = 'tin.eqiad.wmnet'
+
+ file { $mw_common_source:
+ ensure => directory,
+ owner => root,
+ group => wikidev,
+ mode => '0775',
+ }
} else {
$mw_rsync_host = 'deployment-bastion.pmtpa.wmflabs'
+
+ file { '/data/project/apache':
+ ensure => directory,
+ owner => mwdeploy,
+ group => mwdeploy,
+ mode => '0775',
+ }
+
+ file { '/data/project/apache/common-local':
+ ensure => directory,
+ owner => mwdeploy,
+ group => mwdeploy,
+ mode => '0775',
+ }
+
+ file { $mw_common_source:
+ ensure => link,
+ target => '/data/project/apache/common-local',
+ }
}
file {
--
To view, visit https://gerrit.wikimedia.org/r/65254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf19f0e8cf029cdbbbb2dabe3ae1d07cee417c39
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
