Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197355
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.
Bug: T88442
Change-Id: I34112d01af093cf13f31c7f32d21925aa600f9dc
---
M manifests/role/deployment.pp
D manifests/role/scap.pp
M modules/scap/manifests/master.pp
3 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/197355/1
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 3e17919..d865001 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -158,9 +158,13 @@
include network::constants
$deployable_networks = $::network::constants::deployable_networks
- include role::scap::master
include mediawiki
+ include scap::l10nupdate
+ 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/master.pp b/modules/scap/manifests/master.pp
index ed9b129..129e2f6 100644
--- a/modules/scap/manifests/master.pp
+++ b/modules/scap/manifests/master.pp
@@ -7,12 +7,19 @@
$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,
+ }
+
rsync::server::module { 'common':
path => $common_source_path,
read_only => 'yes',
--
To view, visit https://gerrit.wikimedia.org/r/197355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34112d01af093cf13f31c7f32d21925aa600f9dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
