Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/193561
Change subject: tools: Remove tomcat node definitions from puppet ...................................................................... tools: Remove tomcat node definitions from puppet Uses regular generic webservice node now. Bug: T91066 Change-Id: I6d13d9cc5e8dd6d48aacc246d2f65aa49d90650c --- M manifests/role/labstools.pp D modules/toollabs/manifests/node/web/tomcat.pp 2 files changed, 0 insertions(+), 46 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/61/193561/1 diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp index 93df1d0..b14853c 100644 --- a/manifests/role/labstools.pp +++ b/manifests/role/labstools.pp @@ -87,9 +87,4 @@ class webnode inherits role::labs::tools::compute { include toollabs::node::web::lighttpd } - - class tomcatnode inherits role::labs::tools::compute { - include toollabs::node::web::tomcat - } - } # class role::labs::tools diff --git a/modules/toollabs/manifests/node/web/tomcat.pp b/modules/toollabs/manifests/node/web/tomcat.pp deleted file mode 100644 index d8dc596..0000000 --- a/modules/toollabs/manifests/node/web/tomcat.pp +++ /dev/null @@ -1,41 +0,0 @@ -# Class: toollabs::node::web::lighttpd -# -# This configures the compute node as a tomcat web server -# -# Parameters: -# -# Actions: -# -# Requires: -# -# Sample Usage: -# -class toollabs::node::web::tomcat inherits toollabs::node::web { - - package { [ 'tomcat7-user', 'xmlstarlet' ]: - ensure => latest, - } - - # For now, the tomcat nodes double as the generic webserver nodes - class { 'toollabs::queues': - queues => [ 'webgrid-tomcat', 'webgrid-generic' ] - } - - file { '/usr/local/bin/tool-tomcat': - ensure => file, - owner => 'root', - group => 'root', - mode => '0555', - source => 'puppet:///modules/toollabs/tool-tomcat', - } - - file { '/usr/local/bin/tomcat-starter': - ensure => file, - owner => 'root', - group => 'root', - mode => '0555', - source => 'puppet:///modules/toollabs/tomcat-starter', - require => Package['xmlstarlet'], - } - -} -- To view, visit https://gerrit.wikimedia.org/r/193561 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d13d9cc5e8dd6d48aacc246d2f65aa49d90650c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits