ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/393443 )
Change subject: keep misc dumps dirs owner on generating host same as on web
server for now
......................................................................
keep misc dumps dirs owner on generating host same as on web server for now
As these jobs move from web server to generating host, we can
change the owner, but not until then; otherwise jobs are unable
to create the subdir needed for their output
Change-Id: I16d84c2b5ea7e11d0019f084abab5c884f9b3f09
---
M modules/dumps/manifests/generation/server/dirs.pp
M modules/profile/manifests/dumps/generation/server/fallback.pp
M modules/profile/manifests/dumps/generation/server/primary.pp
3 files changed, 17 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/393443/1
diff --git a/modules/dumps/manifests/generation/server/dirs.pp
b/modules/dumps/manifests/generation/server/dirs.pp
index 17d7ae5..16f95b0 100644
--- a/modules/dumps/manifests/generation/server/dirs.pp
+++ b/modules/dumps/manifests/generation/server/dirs.pp
@@ -1,6 +1,8 @@
class dumps::generation::server::dirs(
$user = undef,
$group = undef,
+ $deprecated_user = undef,
+ $deprecated_group = undef,
) {
# Directories where dumps of any type are generated
# This list is not for one-off directories, nor for
@@ -44,15 +46,15 @@
file { $cirrussearchdir:
ensure => 'directory',
mode => '0755',
- owner => $user,
- group => $group,
+ owner => $deprecated_user,
+ group => $deprecated_group,
}
file { $xlationdir:
ensure => 'directory',
mode => '0755',
- owner => $user,
- group => $group,
+ owner => $deprecated_user,
+ group => $deprecated_group,
}
file { $globalblocksdir:
@@ -65,8 +67,8 @@
file { $medialistsdir:
ensure => 'directory',
mode => '0755',
- owner => $user,
- group => $group,
+ owner => $deprecated_user,
+ group => $deprecated_group,
}
file { $incrsdir:
@@ -79,8 +81,8 @@
file { $mediatitlesdir:
ensure => 'directory',
mode => '0755',
- owner => $user,
- group => $group,
+ owner => $deprecated_user,
+ group => $deprecated_group,
}
file { $othermiscdir:
@@ -93,8 +95,8 @@
file { $pagetitlesdir:
ensure => 'directory',
mode => '0755',
- owner => $user,
- group => $group,
+ owner => $deprecated_user,
+ group => $deprecated_group,
}
file { $othertestfilesdir:
diff --git a/modules/profile/manifests/dumps/generation/server/fallback.pp
b/modules/profile/manifests/dumps/generation/server/fallback.pp
index cd8e303..e45478e 100644
--- a/modules/profile/manifests/dumps/generation/server/fallback.pp
+++ b/modules/profile/manifests/dumps/generation/server/fallback.pp
@@ -4,5 +4,7 @@
class { '::dumps::generation::server::dirs':
user => $dumpsuser::user,
group => $dumpsuser::group,
+ deprecated_user => 'datasets',
+ deprecated_group => 'datasets',
}
}
diff --git a/modules/profile/manifests/dumps/generation/server/primary.pp
b/modules/profile/manifests/dumps/generation/server/primary.pp
index dfb52fc..5ee7b34 100644
--- a/modules/profile/manifests/dumps/generation/server/primary.pp
+++ b/modules/profile/manifests/dumps/generation/server/primary.pp
@@ -1,9 +1,12 @@
class profile::dumps::generation::server::primary {
class { '::dumpsuser': }
+ class { '::dumps::deprecated::user': }
class { '::dumps::generation::server::dirs':
user => $dumpsuser::user,
group => $dumpsuser::group,
+ deprecated_user => 'datasets',
+ deprecated_group => 'datasets',
}
class { '::dumps::generation::server::rsyncer':
--
To view, visit https://gerrit.wikimedia.org/r/393443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16d84c2b5ea7e11d0019f084abab5c884f9b3f09
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
