Yuvipanda has submitted this change and it was merged.
Change subject: scap: Clone mediawiki-config on all scap masters
......................................................................
scap: Clone mediawiki-config on all scap masters
- Get rid of scap role, wasn't giving us much.
- Also make group ownership in l10nupdate configurable
- Include l10nupdate on all scap masters
Bug: T88442
Change-Id: I34112d01af093cf13f31c7f32d21925aa600f9dc
---
M manifests/role/deployment.pp
D manifests/role/scap.pp
M modules/scap/manifests/l10nupdate.pp
M modules/scap/manifests/master.pp
4 files changed, 21 insertions(+), 17 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index e552167..e9c5d8c 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -155,9 +155,12 @@
include network::constants
$deployable_networks = $::network::constants::deployable_networks
- include role::scap::master
include mediawiki
+ class { 'scap::master':
+ deployment_group => $deployment_group,
+ }
+
if $::realm != 'labs' {
include wikitech::wiki::passwords
}
diff --git a/manifests/role/scap.pp b/manifests/role/scap.pp
deleted file mode 100644
index 3955e3f..0000000
--- a/manifests/role/scap.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# = class: role::scap::master
-#
-# Sets up a scap master
-class role::scap::master {
- system::role { 'misc::deployment':
- description => 'Deployment host'
- }
-
- include scap::master
- include scap::l10nupdate
-}
diff --git a/modules/scap/manifests/l10nupdate.pp
b/modules/scap/manifests/l10nupdate.pp
index 8e7f173..b675b8c 100644
--- a/modules/scap/manifests/l10nupdate.pp
+++ b/modules/scap/manifests/l10nupdate.pp
@@ -1,9 +1,9 @@
# = class: scap::l10nupdate
#
# Sets up files and cron required to do l10nupdate
-class scap::l10nupdate {
- require scap::master
-
+class scap::l10nupdate(
+ $deployment_group = 'wikidev',
+) {
cron { 'l10nupdate':
ensure => present,
command => '/usr/local/bin/l10nupdate-1 --verbose >>
/var/log/l10nupdatelog/l10nupdate.log 2>&1',
@@ -43,12 +43,12 @@
file { '/var/log/l10nupdatelog':
ensure => directory,
owner => 'l10nupdate',
- group => 'wikidev',
+ group => $deployment_group,
mode => '0664';
'/var/lib/l10nupdate':
ensure => directory,
owner => 'l10nupdate',
- group => 'wikidev',
+ group => $deployment_group,
mode => '0755';
'/var/lib/l10nupdate/caches':
ensure => directory,
diff --git a/modules/scap/manifests/master.pp b/modules/scap/manifests/master.pp
index ed9b129..5c4b158 100644
--- a/modules/scap/manifests/master.pp
+++ b/modules/scap/manifests/master.pp
@@ -7,15 +7,27 @@
$rsync_host = 'tin.eqiad.wmnet',
$statsd_host = 'statsd.eqiad.wmnet',
$statsd_port = 8125,
+ $deployment_group = 'wikidev',
) {
include scap::scripts
include rsync::server
include network::constants
include dsh
+ git::clone { 'operations/mediawiki-config':
+ directory => $common_source_path,
+ ensure => present,
+ group => $deployment_group,
+ shared => true,
+ }
+
rsync::server::module { 'common':
path => $common_source_path,
read_only => 'yes',
hosts_allow => $::network::constants::mw_appserver_networks;
}
+
+ class { 'scap::l10nupdate':
+ deployment_group => $deployment_group,
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/197355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I34112d01af093cf13f31c7f32d21925aa600f9dc
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
