[MediaWiki-commits] [Gerrit] toollabs: lint - change (operations/puppet)

2014-11-25 Thread Yuvipanda (Code Review) 
Yuvipanda has submitted this change and it was merged.

Change subject: toollabs: lint
..


toollabs: lint

Change-Id: If7d9eda0fef5ca8a961021bb1bd21f01b8aa7e93
---
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/mongo.pp
M modules/toollabs/manifests/node/compute/dedicated.pp
M modules/toollabs/manifests/node/web/lighttpd.pp
M modules/toollabs/manifests/node/web/tomcat.pp
5 files changed, 20 insertions(+), 18 deletions(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index e901b0b..6aca761 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -75,7 +75,7 @@
 
 $geconf = "${sysdir}/gridengine"
 $collectors = "${geconf}/collectors"
-
+
 file { $geconf:
 ensure  => directory,
 require => File[$sysdir],
diff --git a/modules/toollabs/manifests/mongo.pp 
b/modules/toollabs/manifests/mongo.pp
index fd941e2..76a92fc 100644
--- a/modules/toollabs/manifests/mongo.pp
+++ b/modules/toollabs/manifests/mongo.pp
@@ -5,9 +5,9 @@
 # We need all the space we can get!
 include role::labs::lvm::srv
 
-class { "mongodb":
+class { 'mongodb':
 settings => {
 auth => "true"
 }
-   }
+}
 }
diff --git a/modules/toollabs/manifests/node/compute/dedicated.pp 
b/modules/toollabs/manifests/node/compute/dedicated.pp
index 32d8481..60ffa4e 100644
--- a/modules/toollabs/manifests/node/compute/dedicated.pp
+++ b/modules/toollabs/manifests/node/compute/dedicated.pp
@@ -32,7 +32,7 @@
 } else {
 
 system::role { 'toollabs::node::compute::dedicated':
-description => "Unassigned dedicated computation node",
+description => 'Unassigned dedicated computation node',
 }
 
 }
diff --git a/modules/toollabs/manifests/node/web/lighttpd.pp 
b/modules/toollabs/manifests/node/web/lighttpd.pp
index f12bc54..0d632f2 100644
--- a/modules/toollabs/manifests/node/web/lighttpd.pp
+++ b/modules/toollabs/manifests/node/web/lighttpd.pp
@@ -33,20 +33,20 @@
 mode   => '1777',
 }
 
-file { "/usr/local/bin/tool-lighttpd":
+file { '/usr/local/bin/tool-lighttpd':
 ensure => file,
 owner  => 'root',
 group  => 'root',
 mode   => '0555',
-source => "puppet:///modules/toollabs/tool-lighttpd",
+source => 'puppet:///modules/toollabs/tool-lighttpd',
 }
 
-file { "/usr/local/bin/lighttpd-starter":
+file { '/usr/local/bin/lighttpd-starter':
 ensure => file,
 owner  => 'root',
 group  => 'root',
 mode   => '0555',
-source => "puppet:///modules/toollabs/lighttpd-starter",
+source => 'puppet:///modules/toollabs/lighttpd-starter',
 }
 
 }
diff --git a/modules/toollabs/manifests/node/web/tomcat.pp 
b/modules/toollabs/manifests/node/web/tomcat.pp
index c16ddff..d8dc596 100644
--- a/modules/toollabs/manifests/node/web/tomcat.pp
+++ b/modules/toollabs/manifests/node/web/tomcat.pp
@@ -17,22 +17,24 @@
 }
 
 # 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",
+class { 'toollabs::queues':
+queues => [ 'webgrid-tomcat', 'webgrid-generic' ]
 }
 
-file { "/usr/local/bin/tomcat-starter":
+file { '/usr/local/bin/tool-tomcat':
 ensure => file,
 owner  => 'root',
 group  => 'root',
 mode   => '0555',
-source => "puppet:///modules/toollabs/tomcat-starter",
+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/175683
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If7d9eda0fef5ca8a961021bb1bd21f01b8aa7e93
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] toollabs: lint - change (operations/puppet)

2014-11-25 Thread Matanya (Code Review) 
Matanya has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/175683

Change subject: toollabs: lint
..

toollabs: lint

Change-Id: If7d9eda0fef5ca8a961021bb1bd21f01b8aa7e93
---
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/mongo.pp
M modules/toollabs/manifests/node/compute/dedicated.pp
M modules/toollabs/manifests/node/web/lighttpd.pp
M modules/toollabs/manifests/node/web/tomcat.pp
5 files changed, 20 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/175683/1

diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index e901b0b..6aca761 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -75,7 +75,7 @@
 
 $geconf = "${sysdir}/gridengine"
 $collectors = "${geconf}/collectors"
-
+
 file { $geconf:
 ensure  => directory,
 require => File[$sysdir],
diff --git a/modules/toollabs/manifests/mongo.pp 
b/modules/toollabs/manifests/mongo.pp
index fd941e2..76a92fc 100644
--- a/modules/toollabs/manifests/mongo.pp
+++ b/modules/toollabs/manifests/mongo.pp
@@ -5,9 +5,9 @@
 # We need all the space we can get!
 include role::labs::lvm::srv
 
-class { "mongodb":
+class { 'mongodb':
 settings => {
 auth => "true"
 }
-   }
+}
 }
diff --git a/modules/toollabs/manifests/node/compute/dedicated.pp 
b/modules/toollabs/manifests/node/compute/dedicated.pp
index 32d8481..60ffa4e 100644
--- a/modules/toollabs/manifests/node/compute/dedicated.pp
+++ b/modules/toollabs/manifests/node/compute/dedicated.pp
@@ -32,7 +32,7 @@
 } else {
 
 system::role { 'toollabs::node::compute::dedicated':
-description => "Unassigned dedicated computation node",
+description => 'Unassigned dedicated computation node',
 }
 
 }
diff --git a/modules/toollabs/manifests/node/web/lighttpd.pp 
b/modules/toollabs/manifests/node/web/lighttpd.pp
index f12bc54..0d632f2 100644
--- a/modules/toollabs/manifests/node/web/lighttpd.pp
+++ b/modules/toollabs/manifests/node/web/lighttpd.pp
@@ -33,20 +33,20 @@
 mode   => '1777',
 }
 
-file { "/usr/local/bin/tool-lighttpd":
+file { '/usr/local/bin/tool-lighttpd':
 ensure => file,
 owner  => 'root',
 group  => 'root',
 mode   => '0555',
-source => "puppet:///modules/toollabs/tool-lighttpd",
+source => 'puppet:///modules/toollabs/tool-lighttpd',
 }
 
-file { "/usr/local/bin/lighttpd-starter":
+file { '/usr/local/bin/lighttpd-starter':
 ensure => file,
 owner  => 'root',
 group  => 'root',
 mode   => '0555',
-source => "puppet:///modules/toollabs/lighttpd-starter",
+source => 'puppet:///modules/toollabs/lighttpd-starter',
 }
 
 }
diff --git a/modules/toollabs/manifests/node/web/tomcat.pp 
b/modules/toollabs/manifests/node/web/tomcat.pp
index c16ddff..d8dc596 100644
--- a/modules/toollabs/manifests/node/web/tomcat.pp
+++ b/modules/toollabs/manifests/node/web/tomcat.pp
@@ -17,22 +17,24 @@
 }
 
 # 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",
+class { 'toollabs::queues':
+queues => [ 'webgrid-tomcat', 'webgrid-generic' ]
 }
 
-file { "/usr/local/bin/tomcat-starter":
+file { '/usr/local/bin/tool-tomcat':
 ensure => file,
 owner  => 'root',
 group  => 'root',
 mode   => '0555',
-source => "puppet:///modules/toollabs/tomcat-starter",
+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/175683
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7d9eda0fef5ca8a961021bb1bd21f01b8aa7e93
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits