Faidon Liambotis has submitted this change and it was merged.
Change subject: parsoid: role class for beta and factor out common code
......................................................................
parsoid: role class for beta and factor out common code
This patch introduce the new role::parsoid::beta, I factored out common
code in the new role::parsoid::common leaving the specific bits in the
production and beta classes.
The main difference is the symbolic link for the Parsoid extension. In
production that is using the nameless deployment system while on beta it
is on the shared NFS export.
bug: 57233
Change-Id: Ia9f2f0466fb5d4a77684dfaa8ed3d4fa31658b15
---
M manifests/role/parsoid.pp
1 file changed, 33 insertions(+), 12 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 9d44f18..62bcaad 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -3,13 +3,7 @@
@monitor_group { 'parsoid_eqiad': description => 'eqiad parsoid servers' }
@monitor_group { 'parsoid_pmtpa': description => 'pmtpa parsoid servers' }
-class role::parsoid::production {
- system::role { 'role::parsoid::production':
- description => 'Parsoid server'
- }
-
- deployment::target { 'parsoid': }
-
+class role::parsoid::common {
package { [
'nodejs',
'npm',
@@ -22,11 +16,6 @@
owner => parsoid,
group => wikidev,
mode => '2775',
- }
-
- file { '/var/lib/parsoid/Parsoid':
- ensure => link,
- target => '/srv/deployment/parsoid/Parsoid',
}
file { '/etc/init.d/parsoid':
@@ -59,8 +48,40 @@
require => File['/etc/init.d/parsoid'],
}
+}
+
+class role::parsoid::production {
+ system::role { 'role::parsoid::production':
+ description => 'Parsoid server'
+ }
+
+ include role::parsoid::common
+
+ deployment::target { 'parsoid': }
+
+ file { '/var/lib/parsoid/Parsoid':
+ ensure => link,
+ target => '/srv/deployment/parsoid/Parsoid',
+ }
+
monitor_service { 'parsoid':
description => 'Parsoid',
check_command => 'check_http_on_port!8000',
}
}
+
+class role::parsoid::beta {
+ system::role { 'role::parsoid::beta':
+ description => 'Parsoid server (on beta)'
+ }
+
+ include role::parsoid::common
+
+ file { '/var/lib/parsoid/Parsoid':
+ ensure => link,
+ target =>
'/data/project/apache/common-local/php-master/extensions/Parsoid',
+ owner => parsoid,
+ group => wikidev,
+ mode => '2775',
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/98014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9f2f0466fb5d4a77684dfaa8ed3d4fa31658b15
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
