[MediaWiki-commits] [Gerrit] ganglia web: avoid using tmpfs on trusty - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: ganglia web: avoid using tmpfs on trusty
......................................................................

ganglia web: avoid using tmpfs on trusty

uranium is trusty and seems to be able to handle the load of ganglia on
its SSDs. So avoid mounting the tmpfs mount

Change-Id: I581fbc4c06b204260e92b469185a10e69ffcd8d7
---
M manifests/ganglia.pp
1 file changed, 13 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/170010/1

diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 50543ac..ec12736 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -523,10 +523,12 @@
                 require => Package['ganglia-webfrontend'],
             }
             $is_trusty = true
+            $tmpfs_ensure = 'absent'
         }
         else {
             $ganglia_webdir = '/srv/org/wikimedia/ganglia-web-latest'
             $ganglia_confdir = '/srv/org/wikimedia/ganglia-web-conf'
+            $tmpfs_ensure = 'present'
         }
 
         $ganglia_ssl_cert = '/etc/ssl/certs/ganglia.wikimedia.org.pem'
@@ -542,21 +544,21 @@
     }
 
     file { '/usr/local/bin/restore-gmetad-rrds':
-        ensure => present,
+        ensure => $tmpfs_ensure,
         mode   => '0555',
         owner  => 'root',
         group  => 'root',
         source => 'puppet:///files/ganglia/restore-gmetad-rrds',
     }
     file { '/usr/local/bin/save-gmetad-rrds':
-        ensure => present,
+        ensure => $tmpfs_ensure,
         mode   => '0555',
         owner  => 'root',
         group  => 'root',
         source => 'puppet:///files/ganglia/save-gmetad-rrds',
     }
     file { '/etc/init.d/gmetad':
-        ensure => present,
+        ensure => $tmpfs_ensure,
         mode   => '0555',
         owner  => 'root',
         group  => 'root',
@@ -569,7 +571,7 @@
         group  => 'root',
     }
     file { '/etc/rc.local':
-        ensure => present,
+        ensure => $tmpfs_ensure,
         mode   => '0555',
         owner  => 'root',
         group  => 'root',
@@ -578,7 +580,7 @@
 
     # back up rrds every half hour
     cron { 'save-rrds':
-        ensure  => present,
+        ensure  => $tmpfs_ensure,
         command => '/usr/local/bin/save-gmetad-rrds',
         user    => 'root',
         minute  => [ 7, 37 ],
@@ -595,8 +597,13 @@
         group  => 'root',
     }
 
+    # Avoiding mounting as tmpfs on trusty
+    case $tmpfs_ensure {
+        'present': { $mount_tmpfs = 'mounted' }
+        default: { $mount_tmpfs = 'absent' }
+    }
     mount { $ganglia_tmp_mountpoint:
-        ensure  => mounted,
+        ensure  => $mount_tmpfs,
         require => File[$ganglia_tmp_mountpoint],
         device  => 'tmpfs',
         fstype  => 'tmpfs',
@@ -612,7 +619,6 @@
         owner   => 'nobody',
         group   => 'root',
     }
-
 }
 
 # == Class ganglia::logtailer

-- 
To view, visit https://gerrit.wikimedia.org/r/170010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I581fbc4c06b204260e92b469185a10e69ffcd8d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>

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