KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/180125
Change subject: WIP: Add cxserver role for production
......................................................................
WIP: Add cxserver role for production
Change-Id: If30737aa255ef8eeb7b51a865abef405086a9c97
---
M manifests/role/cxserver.pp
1 file changed, 52 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/25/180125/1
diff --git a/manifests/role/cxserver.pp b/manifests/role/cxserver.pp
index 0c658ae..e978763 100644
--- a/manifests/role/cxserver.pp
+++ b/manifests/role/cxserver.pp
@@ -1,10 +1,58 @@
# vim: set ts=4 et sw=4:
-# We do not have monitoring yet
-#@monitoring::group { 'cxserver_eqiad': description => 'eqiad cxserver
servers' }
+# cxserver is in a service cluster A.
+@monitoring::group { 'sca_eqiad': description => 'Service Cluster A servers' }
-# Skipping production for now
-#class role::cxserver::production {}
+class role::cxserver::production {
+ system::role { 'role::cxserver::production':
+ description => 'cxserver server'
+ }
+
+ class { '::cxserver':
+ base_path => '/srv/deployment/cxserver/cxserver',
+ node_path => '/srv/deployment/cxserver/deploy/node_modules',
+ conf_path => '/srv/deployment/cxserver/config.js',
+ log_dir => '/data/project/cxserver/log',
+ parsoid => 'http://parsoid-lb.eqiad.wikimedia.org',
+ apertium => 'http://apertium.wmflabs.org',
+ require => [
+ File['/srv/deployment/cxserver'],
+ File['/data/project/cxserver']
+ ],
+ }
+
+ # Need to allow jenkins-deploy to reload cxserver
+ sudo::user { 'jenkins-deploy': privileges => [
+ # Since the "root" user is local, we cant add the sudo policy in
+ # OpenStack manager interface at wikitech
+ 'ALL = (root) NOPASSWD:/usr/sbin/service cxserver restart',
+ ] }
+
+ # Make sure the log directory parent exists on beta
+ file { '/data/project/cxserver':
+ ensure => directory,
+ owner => cxserver,
+ group => cxserver,
+ mode => '0775',
+ }
+
+ # cxserver repositories and config under /srv/deployment/cxserver
+ file { '/srv/deployment/cxserver':
+ ensure => directory,
+ owner => jenkins-deploy,
+ group => wikidev,
+ mode => '0755',
+ }
+
+ # Define cxserver port
+ $cxserver_port = '8080'
+
+ # We have to explicitly open the cxserver port (bug 45868)
+ ferm::service { 'cxserver_http':
+ proto => 'tcp',
+ port => $cxserver_port,
+ }
+}
class role::cxserver::beta {
system::role { 'role::cxserver::beta':
--
To view, visit https://gerrit.wikimedia.org/r/180125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If30737aa255ef8eeb7b51a865abef405086a9c97
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
