Rush has uploaded a new change for review.
https://gerrit.wikimedia.org/r/314028
Change subject: labstore: align tools drbd with current prod
......................................................................
labstore: align tools drbd with current prod
Change-Id: If5d9283ccd05b4792b6122cf531128492f19066d
---
M modules/role/manifests/labs/nfs/secondary.pp
A modules/toollabs/manifests/dev_environ.pp.save
2 files changed, 152 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/314028/1
diff --git a/modules/role/manifests/labs/nfs/secondary.pp
b/modules/role/manifests/labs/nfs/secondary.pp
index 104120f..c6fe780 100644
--- a/modules/role/manifests/labs/nfs/secondary.pp
+++ b/modules/role/manifests/labs/nfs/secondary.pp
@@ -44,8 +44,8 @@
nodes => $nodes,
addresses => $addresses,
port => '7791',
- device => '/dev/drbd2',
- disk => '/dev/tools-project/tools-project',
+ device => '/dev/drbd4',
+ disk => '/dev/tools/tools-project',
require => Interface::Ip['drbd-replication'],
}
diff --git a/modules/toollabs/manifests/dev_environ.pp.save
b/modules/toollabs/manifests/dev_environ.pp.save
new file mode 100644
index 0000000..08ca78c
--- /dev/null
+++ b/modules/toollabs/manifests/dev_environ.pp.save
@@ -0,0 +1,150 @@
+# Class: toollabs::dev_environ
+#
+# This class sets up a node as a dev environment for tool labs.
+# This is a "sub" role included by the actual tool labs roles and would
+# normally not be included directly in node definitions.
+#
+# Those are the dependencies for development tools and packages intended
+# for interactive use.
+#
+# Parameters:
+#
+# Actions:
+# - Install tool dependencies
+#
+# Requires:
+#
+# Sample Usage:
+#
+class toollabs::dev_environ {
+ include toollabs::composer
+
+ if os_version('ubuntu trusty') {
+ include toollabs::genpp::python_dev_trusty
+ package { [
+ 'bundler', # T120287
+ # Previously we installed libmariadbclient-dev, but that causes
+ # dependency issues on Trusty. libmariadbclient-dev formerly
+ # provided libmysqlclient-dev, but not in trusty.
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759309
+ 'libmysqlclient-dev',
+ 'libboost-python1.54-dev',
+ 'redis-tools',
+ ]:
+ ensure => latest,
+ }
+ } elsif os_version('ubuntu precise') {
+ include toollabs::genpp::python_dev_precise
+ package { [
+ 'libmariadbclient-dev',
+ 'libboost-python1.48-dev',
+ ]:
+ ensure => latest,
+ }
+ } elsif os_version('debian jessie') {
+ include toollabs::genpp::python_dev_jessie
+ package { [
+ 'bundler', # T120287
+ 'libmariadb-client-lgpl-dev',
+ 'libmariadb-client-lgpl-dev-compat',
+ 'libboost-python1.55-dev',
+ ]:
+ ensure => latest,
+ }
+ }
+
+ package { [
+ 'ant',
+ 'apt-file',
+ 'autoconf',
+ 'automake', # T119870
+ 'build-essential', # for dpkg
+ 'byobu', # T88989.
+ 'cmake',
+ 'cvs',
+ 'cython',
+ 'dh-make-perl',
+ 'elinks',
+ 'emacs',
+ 'fakeroot', # for dpkg
+ 'flex', # T114003.
+ 'gcj-jdk', # T58995
+ 'ipython', # T58995
+ 'joe', # T64236.
+ 'libdjvulibre-dev', # T58972
+ 'libdmtx-dev', # T55867.
+ 'libfcgi-dev', # T54902.
+ 'libfreetype6-dev',
+ 'libgdal1-dev', # T58995
+ 'libgeoip-dev', # T64649
+ 'libldap2-dev', # T114388
+ 'libpng12-dev',
+ 'libproj-dev', # T58995
+ 'libprotobuf-dev', # T58995
+ 'librsvg2-dev', # T60516
+ 'libsasl2-dev', # T114388
+ 'libsparsehash-dev', # T58995
+ 'libssl-dev', # T114388
+ 'libtiff4-dev', # T54717
+ 'libtool',
+ 'libvips-dev',
+ 'libxml2-dev',
+ 'libxslt1-dev',
+ 'libzbar-dev', # T58996
+ 'links',
+ 'lintian',
+ 'lynx',
+ 'maven',
+ 'mc', # Popular{{cn}} on Toolserver
+ 'mercurial',
+ 'mytop', # T58999
+ 'openjdk-7-jdk',
+ 'pastebinit',
+ 'pep8', # T59863
+ 'qt4-qmake',
+ 'rake', # T120287
+ 'rlwrap', # T87368
+ 'ruby-dev', # T120287
+ 'sbt',
+ 'sqlite3',
+ 'subversion',
+ 'tcl8.5-dev',
+ 'tig',
+ 'valgrind', # T87117.
+ ]:
+ ensure => latest,
+ }
+
+ # pastebinit configuration for http://tools.wmflabs.org/paste/.
+ file { '/etc/pastebin.d':
+ ensure => 'directory',
+ require => Package['pastebinit'],
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ }
+ file { '/etc/pastebin.d/tools.conf':
+ ensure => 'file',
+ require => File['/etc/pastebin.d'],
+ source => 'puppet:///modules/toollabs/pastebinit.conf',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ }
+
+ file { [
+ '/usr/local/bin/webservice2',
+ '/usr/local/bin/webservice'
+ ]:
+ ensure => link,
+ target => '/usr/bin/webservice',
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ }
+
+
+
+ # TODO: deploy scripts
+ # TODO: packager
+}
--
To view, visit https://gerrit.wikimedia.org/r/314028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5d9283ccd05b4792b6122cf531128492f19066d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
