BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/140045
Change subject: beta: Small scap fixes
......................................................................
beta: Small scap fixes
* Require ::role::labs::lvm::srv instead of using labs_lvm::volume
directly.
* Add system::role descriptions for role::beta::rsync_slave and
role::beta::scap_target.
* Fix filename in FIXME for role::beta::rsync_slave.
* Add role::beta::jobrunner to bundle scap and jobrunner settings.
Change-Id: Ica12bcf42c4dd3d18a42780a3be7b3d24ae764e7
---
M manifests/role/beta.pp
1 file changed, 21 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/140045/1
diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp
index a14cb70..2c0f8e7 100644
--- a/manifests/role/beta.pp
+++ b/manifests/role/beta.pp
@@ -47,36 +47,36 @@
# Provision an rsync slave server for scap in beta
#
class role::beta::rsync_slave {
- include labs_lvm
-
- labs_lvm::volume { 'second-local-disk':
- mountat => '/srv',
+ system::role { 'role::beta::rsync_slave':
+ description => 'Scap rsync fanout server'
}
+
+ require ::role::labs::lvm::srv
+ include ::beta::scap::rsync_slave
# FIXME: Each host that has this role applied must also be
# manually added to the dsh group file found in
- # modules/beta/files/dsh/group/mediawiki-installation or scap will
+ # modules/beta/files/dsh/group/scap-proxies or scap will
# not communicate with that host.
- class { '::beta::scap::rsync_slave':
- require => Labs_lvm::Volume['second-local-disk'],
- }
}
+# Class: role::beta::scap_target
+#
+# Provision a target host for scap in beta
+#
class role::beta::scap_target {
+ system::role { 'role::beta::scap_target':
+ description => 'Scap deployment target'
+ }
+
+ require ::role::labs::lvm::srv
include ::beta::common
+ include ::beta::scap::target
# FIXME: Each host that has this role applied must also be
# manually added to the dsh group file found in
# modules/beta/files/dsh/group/mediawiki-installation or scap will
# not communicate with that host.
- class { '::beta::scap::target':
- require => Labs_lvm::Volume['second-local-disk'],
- }
-
- include labs_lvm
-
- # Eqiad instances do not mount additional disk space
- labs_lvm::volume { 'second-local-disk': mountat => '/srv' }
}
class role::beta::appserver {
@@ -134,3 +134,8 @@
include role::beta::scap_target
include role::mediawiki::videoscaler
}
+
+class role::beta::jobrunner {
+ include role::beta::scap_target
+ include role::mediawiki::jobrunner
+}
--
To view, visit https://gerrit.wikimedia.org/r/140045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica12bcf42c4dd3d18a42780a3be7b3d24ae764e7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
