Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Kill ganglia::web, replaced by ganglia_new::web
......................................................................


Kill ganglia::web, replaced by ganglia_new::web

Change-Id: Ifaaff93efebe107bdf9ae2cbb35e97bcf384b830
---
D files/ganglia/conf.php
D files/ganglia/conf_production.php
D files/ganglia/gmetad
D files/ganglia/rc.local
D files/ganglia/restore-gmetad-rrds
D files/ganglia/save-gmetad-rrds
M manifests/ganglia.pp
7 files changed, 0 insertions(+), 663 deletions(-)

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



diff --git a/files/ganglia/conf.php b/files/ganglia/conf.php
deleted file mode 100644
index c16bb14..0000000
--- a/files/ganglia/conf.php
+++ /dev/null
@@ -1,359 +0,0 @@
-<?php
-#
-# Gmetad-webfrontend version. Used to check for updates.
-#
-$conf['gweb_root'] = dirname(__FILE__);
-
-include_once $conf['gweb_root'] . "/version.php";
-
-#
-# 'readonly': No authentication is required.  All users may view all 
resources.  No edits are allowed.
-#  'enabled': Guest users may view public clusters.  Login is required to make 
changes.  
-#             An administrator must configure an authentication scheme and ACL 
rules.
-# 'disabled': Guest users may perform any actions, including edits.  No 
authentication is required.
-$conf['auth_system'] = 'readonly';
-
-#
-# The name of the directory in "./templates" which contains the
-# templates that you want to use. Templates are like a skin for the
-# site that can alter its look and feel.
-#
-$conf['template_name'] = "default";
-
-#
-# If you installed gmetad in a directory other than the default
-# make sure you change it here.
-#
-
-# Where gmetad stores the rrd archives.
-$conf['gmetad_root'] = "/var/lib/ganglia";
-$conf['rrds'] = "/mnt/ganglia_tmp/rrds.pmtpa";
-
-# Where Dwoo (PHP templating engine) store compiled templates
-$conf['dwoo_compiled_dir'] = "${conf['gmetad_root']}/dwoo/compiled";
-$conf['dwoo_cache_dir'] = "${conf['gmetad_root']}/dwoo/cache";
-
-# Where to store web-based configuration
-$conf['views_dir'] = $conf['gmetad_root'] . '/conf';
-$conf['conf_dir'] = $conf['gmetad_root'] . '/conf';
-
-# Where to find filter configuration files, if not set filtering
-# will be disabled
-#$conf['filter_dir'] = "${conf['gmetad_root']}/filters";
-
-# Leave this alone if rrdtool is installed in $conf['gmetad_root'],
-# otherwise, change it if it is installed elsewhere (like /usr/bin)
-$conf['rrdtool'] = "/usr/bin/rrdtool";
-
-# Render graphs with rrdtool's --slope-mode option
-$conf['rrdtool_slope_mode'] = true;
-
-# If rrdcached is being used, this argument must specify the 
-# socket to use.
-#
-# ganglia-web only requires, and should use, the low-privilege socket
-# created with the -L option to rrdcached.  gmetad requires, and must use,
-# the fully privileged socket created with the -l option to rrdcached.
-$conf['rrdcached_socket'] = "";
-
-# Location for modular-graph files.
-$conf['graphdir']=__DIR__ .'/graph.d';
-
-# Display statistical values on RRD graphs; i.e.: average, min, max
-$conf['graphreport_stats'] = true;
-$conf['graphreport_stat_items'] = array("now", "min", "avg", "max");
-
-#
-# If you want to grab data from a different ganglia source specify it here.
-# Although, it would be strange to alter the IP since the Round-Robin
-# databases need to be local to be read. 
-#
-$conf['ganglia_ip'] = "127.0.0.1";
-$conf['ganglia_port'] = 8654;
-
-#
-# The maximum number of dynamic graphs to display.  If you set this
-# to 0 (the default) all graphs will be shown.  This option is
-# helpful if you are viewing the web pages from a browser with a 
-# small pipe.
-#
-$conf['max_graphs'] = 0;
-
-#
-# In the Cluster View this sets the default number of columns used to
-# display the host grid below the summary graphs.
-#
-$conf['hostcols'] = 4;
-
-#
-# In the Host View this sets the default number of columns used to
-# display the metric grid below the summary graphs.
-#
-$conf['metriccols'] = 2;
-
-#
-# Turn on and off the Grid Snapshot. Now that we have a
-# hierarchical snapshot (per-cluster instead of per-node) on
-# the meta page this makes more sense. Most people will want this
-# on.
-#
-$conf['show_meta_snapshot'] = "yes";
-
-# 
-# The default refresh frequency on pages.
-#
-$conf['default_refresh'] = 300;
-
-#
-# Colors for the CPU report graph
-#
-$conf['cpu_user_color'] = "3333bb";
-$conf['cpu_nice_color'] = "ffea00";
-$conf['cpu_system_color'] = "dd0000";
-$conf['cpu_wio_color'] = "ff8a60";
-$conf['cpu_idle_color'] = "e2e2f2";
-
-#
-# Colors for the MEMORY report graph
-#
-$conf['mem_used_color'] = "5555cc";
-$conf['mem_shared_color'] = "0000aa";
-$conf['mem_cached_color'] = "33cc33";
-$conf['mem_buffered_color'] = "99ff33";
-$conf['mem_free_color'] = "00ff00";
-$conf['mem_swapped_color'] = "9900CC";
-
-#
-# Colors for the LOAD report graph
-#
-$conf['load_one_color'] = "CCCCCC";
-$conf['proc_run_color'] = "0000FF";
-$conf['cpu_num_color']  = "FF0000";
-$conf['num_nodes_color'] = "00FF00";
-
-# Other colors
-$conf['jobstart_color'] = "ff3300";
-
-#
-# Colors for the load ranks.
-#
-$conf['load_colors'] = array(
-   "100+" => "ff634f",
-   "75-100" =>"ffa15e",
-   "50-75" => "ffde5e",
-   "25-50" => "caff98",
-   "0-25" => "e2ecff",
-   "down" => "515151"
-);
-
-#
-# Load scaling
-#
-$conf['load_scale'] = 1.0;
-
-#
-# Default color for single metric graphs
-#
-$conf['default_metric_color'] = "555555";
-
-#
-# Default metric 
-#
-$conf['default_metric'] = "load_one";
-
-#
-# remove the domainname from the FQDN hostnames in graphs
-# (to help with long hostnames in small charts)
-#
-$conf['strip_domainname'] = true;
-
-#
-# Optional summary graphs
-#
-#$conf['optional_graphs'] = array('packet');
-
-# Enable Zoom support on graphs
-$conf['zoom_support'] = true;
-
-
-# 
-# Time ranges
-# Each value is the # of seconds in that range.
-#
-$conf['time_ranges'] = array(
-   '20min'=>1200,
-   'hour'=>3600,
-   '2hr'=>7200,
-   '4hr'=>14400,
-   'day'=>86400,
-   'week'=>604800,
-   'month'=>2419200,
-   'year'=>31449600
-);
-
-# this key must exist in $conf['time_ranges']
-$conf['default_time_range'] = 'hour';
-
-# Graph Engine to use
-$conf['graph_engine'] = "rrdtool";
-
-#$conf['graph_engine'] = "graphite";
-$conf['graphite_url_base'] = "http://127.0.0.1/render";;
-$conf['graphite_rrd_dir'] = "/opt/graphite/storage/rrd";
-# Don't forget a trailing "." when specifying a prefix.
-# Default is empty.
-$conf['graphite_prefix'] = "";
-
-# One of the bottlenecks is that to get individual metrics we query gmetad 
which
-# returns every single host and all the metrics. If you have lots of hosts and 
lots of 
-# checks this may be quite heavy so you may want to cache data
-$conf['cachedata'] = 1;
-$conf['cachefile'] = $conf['conf_dir'] . "/ganglia_metrics.cache";
-$conf['cachetime'] = 1200; // How long to cache the data in seconds
-
-# Different settings for Nagios
-$conf['nagios_cache_enabled'] = 1;
-$conf['nagios_cache_file'] = $conf['conf_dir'] . "/nagios_ganglia.cache";
-# Cache data for how many seconds
-$conf['nagios_cache_time'] = 45;
-
-#
-# Graph sizes
-#
-$conf['graph_sizes'] = array(
-   'small'=>array(
-     'height'=>65,
-     'width'=>200,
-     'fudge_0'=>0,
-     'fudge_1'=>0,
-     'fudge_2'=>0
-   ),
-   'medium'=>array(
-     'height'=>95,
-     'width'=>300,
-     'fudge_0'=>0,
-     'fudge_1'=>14,
-     'fudge_2'=>28
-   ),
-
-  'large'=>array(
-     'height'=>150,
-     'width'=>480,
-     'fudge_0'=>0,
-     'fudge_1'=>0,
-     'fudge_2'=>0
-   ),
-
-   'xlarge'=>array(
-     'height'=>300,
-     'width'=>650,
-     'fudge_0'=>0,
-     'fudge_1'=>0,
-     'fudge_2'=>0
-   ),
-
-   'xxlarge'=>array(
-     'height'=>700,
-     'width'=>1150,
-     'fudge_0'=>0,
-     'fudge_1'=>0,
-     'fudge_2'=>0
-   ),
-
-   'mobile'=>array(
-     'height'=>95,
-     'width'=>220,
-     'fudge_0'=>0,
-     'fudge_1'=>0,
-     'fudge_2'=>0
-   ),
-
-   # this was the default value when no other size was provided.
-   'default'=>array(
-     'height'=>100,
-     'width'=>400,
-     'fudge_0'=>0,
-     'fudge_1'=>0,
-     'fudge_2'=>0
-   )
-
-);
-$conf['default_graph_size'] = 'default';
-$conf['graph_sizes_keys'] = array_keys( $conf['graph_sizes'] );
-
-# sets a default graph size separate from the regular default graph size. You
-# can also set this default on a per-view basis by setting 'default_size' in 
-# the view .json file.
-$conf['default_view_graph_size'] = 'medium';
-
-# The API can serve up graphs, but the URLs should be fully qualified.
-# The default value is a hack to serve up the called hostname when
-# possible. It is best to define this manually.
-$conf['external_location'] = "http://localhost/ganglia-2";;
-
-# In earlier versions of gmetad, hostnames were handled in a case
-# sensitive manner
-# If your hostname directories have been renamed to lower case,
-# set this option to 0 to disable backward compatibility.
-# From version 3.2, backwards compatibility will be disabled by default.
-# default: true  (for gmetad < 3.2)
-# default: false (for gmetad >= 3.2)
-$conf['case_sensitive_hostnames'] = true;
-
-# The following property controls whether the graphs contained in metric
-# groups are initially displayed or collapsed
-$conf['metric_groups_initially_collapsed'] = false;
-
-# Overlay events on graphs. Those are defined by specifying all the events
-# in events.json
-$conf['overlay_events'] = true;
-
-# Settings for allowing the Nagios API to be used as an additional
-# event source. Will only be enabled if overlay_nagios_events is true.
-$conf['overlay_nagios_events'] = false;
-$conf['overlay_nagios_base_url'] = 'http://localhost/nagios';
-
-# If you have periodic events that happen often e.g. they will make the
-# graph poorly. By default we exclude events on monthly and yearly graphs
-$conf['overlay_events_exclude_ranges'] = array("month", "year");
-
-# Overlay events line can be either dashed or solid. Use "solid" for solid
-# lines, anything else (including blanks) means a dashed line.
-$conf['overlay_events_line_type'] = "dashed";
-
-# What is the provider use to provide events.
-# Examples: "json", "mdb2"
-$conf['overlay_events_provider'] = "json";
-# Where is the Overlay events file stored
-$conf['overlay_events_file'] = $conf['conf_dir'] . "/events.json";
-
-# If using MDB2, connection string:
-$conf['overlay_events_dsn'] = "mysql://dbuser:dbpassword@localhost/ganglia";
-
-$conf['overlay_events_color_map_file'] = $conf['conf_dir'] . 
"/event_color.json";
-
-# For event shading.  Value in hex, 'FF' = 100% opaque.
-# the _shade_ value should be less than _tick_
-$conf['overlay_events_tick_alpha']  = '30';
-$conf['overlay_events_shade_alpha'] = '20';
-
-# Colors to use e.g. in graph_colors
-$conf['graph_colors'] = array("0000A3", "FF3300", "FFCC33", "00CC66", 
"B88A00", "33FFCC", "809900", "FF3366", "FF33CC", "CC33FF", "CCFF33", "FFFF66", 
"33CCFF");
-
-# Are heatmaps enabled
-$conf['heatmaps_enabled'] = 1;
-
-# Decorated titles are of the form cluster/host, graph_title/metric, 
-# time range. By setting this attribute to false the clsuter/host and 
-# time range items are excluded.
-$conf['decorated_graph_title'] = true;
-
-# If set to yes, will display stacked graph (aggregated metric across hosts) 
in cluster view
-$conf['show_stacked_graphs'] = 1;
-
-# If set to false the grid view under the main tab will be displayed only if 
-# the grid name is not "unspecified", or a parent grid has been defined.
-# If set to true the grid view will always be displayed even when only a
-# single cluster has been defined.
-$conf['always_display_grid_view'] = true;
-?>
diff --git a/files/ganglia/conf_production.php 
b/files/ganglia/conf_production.php
deleted file mode 100644
index f291a6d..0000000
--- a/files/ganglia/conf_production.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-#
-# If you installed gmetad in a directory other than the default
-# make sure you change it here.
-#
-
-# Where gmetad stores the rrd archives.
-$conf['gmetad_root'] = "/mnt/ganglia_tmp";
-$conf['rrds'] = "${conf['gmetad_root']}/rrds.pmtpa";
-
-# If you want to grab data from a different ganglia source specify it here.
-# Although, it would be strange to alter the IP since the Round-Robin
-# databases need to be local to be read. 
-#
-$conf['ganglia_ip'] = "127.0.0.1";
-$conf['ganglia_port'] = 8654;
-
-#
-# Default metric 
-#
-$conf['default_metric'] = "cpu_report";
-
-?>
diff --git a/files/ganglia/gmetad b/files/ganglia/gmetad
deleted file mode 100755
index ac298ea..0000000
--- a/files/ganglia/gmetad
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-#
-# MANGED BY PUPPET
-#
-### BEGIN INIT INFO
-# Provides:         gmetad
-# Required-Start:    $network $named $remote_fs $syslog
-# Required-Stop:     $network $named $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-### END INIT INFO 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/gmetad
-NAME=gmetad
-DESC="Ganglia Monitor Meta-Daemon"
-
-# making this file also copy rrd's from disk to tmpfs
-
-RRDS_DIR='/mnt/ganglia_tmp/rrds.pmtpa'
-RESTORESCRIPT=/usr/local/bin/restore-gmetad-rrds
-SAVESCRIPT=/usr/local/bin/save-gmetad-rrds
-
-test -x $DAEMON || exit 0
-
-set -e
-
-case "$1" in
-  start)
-       echo -n "Copying files to tmpfs: "
-       ${RESTORESCRIPT}
-       echo "Done" 
-       echo -n "Starting $DESC: "
-       if [ ! -d "${RRDS_DIR}" ]; then
-               echo "No such directory ${$RRDS_DIR}; aborting."
-               exit 1
-       fi
-       start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-               --exec $DAEMON 
-       echo "$NAME."
-       ;;
-  stop)
-       echo -n "Stopping $DESC: "
-       start-stop-daemon --stop  --quiet --oknodo \
-               --exec $DAEMON  2>&1 > /dev/null 
-       echo "$NAME."
-       echo -n "Copying files from tmpfs: "
-       $SAVESCRIPT
-       echo "Done" 
-       ;;
-  reload)
-  ;;
-  restart|force-reload)
-       $0 stop
-       $0 start
-       ;;
-  *)
-       N=/etc/init.d/$NAME
-       # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-       echo "Usage: $N {start|stop|restart|force-reload}" >&2
-       exit 1
-       ;;
-esac
-
-exit 0
diff --git a/files/ganglia/rc.local b/files/ganglia/rc.local
deleted file mode 100644
index 09886aa..0000000
--- a/files/ganglia/rc.local
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-#
-# rc.local
-#
-# This script is executed at the end of each multiuser runlevel.
-# Make sure that the script will "exit 0" on success or any other
-# value on error.
-#
-# In order to enable or disable this script just change the execution
-# bits.
-#
-# By default this script does nothing.
-
-# Restore Ganglia tmpfs metrics.
-/usr/local/bin/restore-gmetad-rrds
-
-# Start Nagios bot
-
-exit 0
diff --git a/files/ganglia/restore-gmetad-rrds 
b/files/ganglia/restore-gmetad-rrds
deleted file mode 100755
index 462959c..0000000
--- a/files/ganglia/restore-gmetad-rrds
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-GANGLIA_TMP='/mnt/ganglia_tmp'
-mountpoint -q "${GANGLIA_TMP}" || mount "${GANGLIA_TMP}"
-mountpoint -q "${GANGLIA_TMP}" || exit 1
-[ -d /mnt/ganglia_tmp/rrds.pmtpa ] || mkdir /mnt/ganglia_tmp/rrds.pmtpa
-chown nobody /mnt/ganglia_tmp/rrds.pmtpa
-rsync -a /var/lib/ganglia/rrds.pmtpa/ /mnt/ganglia_tmp/rrds.pmtpa
diff --git a/files/ganglia/save-gmetad-rrds b/files/ganglia/save-gmetad-rrds
deleted file mode 100755
index 94eaa64..0000000
--- a/files/ganglia/save-gmetad-rrds
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-
-chown nobody /mnt/ganglia_tmp/rrds.pmtpa
-/usr/bin/rsync -a --delete /mnt/ganglia_tmp/rrds.pmtpa/ 
/var/lib/ganglia/rrds.pmtpa/
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index fd923b1..0a036e8 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -395,190 +395,6 @@
     }
 }
 
-class ganglia::web {
-# Class for the ganglia frontend machine
-
-    require ganglia::collector
-    require subversion::client
-
-    include ::apache
-    include ::apache::mod::php5
-    include ::apache::mod::ssl
-    include ::apache::mod::rewrite
-
-    ganglia::plugin::python { 'diskstat': }
-
-    package { [ 'php5-gd',
-                'php5-mysql',
-                'rrdtool',
-                'librrds-perl',
-            ]:
-        ensure => present,
-    }
-
-    # Monitoring
-    monitoring::service { 'ganglia_http':
-        description   => 'HTTP',
-        check_command => 'check_http',
-    }
-
-    if $::realm == 'labs' {
-        $ganglia_servername = 'ganglia.wmflabs.org'
-        $ganglia_serveralias = 'aggregator.eqiad.wmflabs'
-        $ganglia_webdir = '/usr/share/ganglia-webfrontend'
-        $ganglia_confdir = '/var/lib/ganglia/conf'
-        $ganglia_dwoo = '/var/lib/ganglia/dwoo'
-        $ganglia_dwoo_cache = "${ganglia_dwoo}/cache"
-        $ganglia_dwoo_compiled = "${ganglia_dwoo}/compiled"
-
-        file { [
-            $ganglia_confdir,
-            $ganglia_dwoo,
-            $ganglia_dwoo_cache,
-            $ganglia_dwoo_compiled,
-        ]:
-            ensure => directory,
-            owner  => 'www-data',
-            group  => 'root',
-            mode   => '0775',
-        }
-
-        include ganglia::aggregator
-
-        file { '/usr/share/ganglia-webfrontend/conf.php':
-            ensure  => present,
-            mode    => '0444',
-            owner   => 'root',
-            group   => 'root',
-            source  => 'puppet:///files/ganglia/conf.php',
-            require => Package['ganglia-webfrontend'],
-        }
-        file { '/usr/share/ganglia-webfrontend/conf_default.php':
-            ensure => link,
-            target => '/usr/share/ganglia-webfrontend/conf.php',
-        }
-        file { '/usr/share/ganglia-webfrontend/version.php':
-            content => '<?php $GLOBALS["ganglia_version"] = "wmflabs";';
-        }
-
-    } else {
-        # We are in production land
-        $ganglia_servername = 'ganglia.wikimedia.org'
-        $ganglia_serveralias = 'uranium.wikimedia.org'
-        #TODO: Ugly hideous hack to be removed soon after we migrate to trusty
-        if os_version('ubuntu >= trusty') {
-            package { 'ganglia-webfrontend':
-                ensure => present,
-            }
-            $ganglia_webdir = '/usr/share/ganglia-webfrontend'
-            $ganglia_confdir = '/var/lib/ganglia-web'
-            file { '/etc/ganglia-webfrontend/conf.php':
-                ensure  => present,
-                mode    => '0444',
-                owner   => 'root',
-                group   => 'root',
-                source  => 'puppet:///files/ganglia/conf_production.php',
-                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'
-        $ganglia_ssl_key = '/etc/ssl/private/ganglia.wikimedia.org.key'
-
-        $ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
-        include role::backup::host
-        backup::set { 'var-lib-ganglia': }
-    }
-
-    apache::site { $ganglia_servername:
-        content => template("apache/sites/${ganglia_servername}.erb"),
-    }
-
-    file { '/usr/local/bin/restore-gmetad-rrds':
-        ensure => $tmpfs_ensure,
-        mode   => '0555',
-        owner  => 'root',
-        group  => 'root',
-        source => 'puppet:///files/ganglia/restore-gmetad-rrds',
-    }
-    file { '/usr/local/bin/save-gmetad-rrds':
-        ensure => $tmpfs_ensure,
-        mode   => '0555',
-        owner  => 'root',
-        group  => 'root',
-        source => 'puppet:///files/ganglia/save-gmetad-rrds',
-    }
-    file { '/etc/init.d/gmetad':
-        ensure => $tmpfs_ensure,
-        mode   => '0555',
-        owner  => 'root',
-        group  => 'root',
-        source => 'puppet:///files/ganglia/gmetad',
-    }
-    file { '/var/lib/ganglia/rrds.pmtpa/':
-        ensure => directory,
-        mode   => '0755',
-        owner  => 'nobody',
-        group  => 'root',
-    }
-    file { '/etc/rc.local':
-        ensure => $tmpfs_ensure,
-        mode   => '0555',
-        owner  => 'root',
-        group  => 'root',
-        source => 'puppet:///files/ganglia/rc.local',
-    }
-
-    # back up rrds every half hour
-    cron { 'save-rrds':
-        ensure  => $tmpfs_ensure,
-        command => '/usr/local/bin/save-gmetad-rrds',
-        user    => 'root',
-        minute  => [ 7, 37 ],
-    }
-
-    # Mount /mnt/ganglia_tmp as tmpfs to avoid Linux flushing mlocked
-    # shm memory to disk
-    $ganglia_tmp_mountpoint = '/mnt/ganglia_tmp'
-
-    file { $ganglia_tmp_mountpoint:
-        ensure => directory,
-        mode   => '0755',
-        owner  => 'root',
-        group  => 'root',
-    }
-
-    # Avoiding mounting as tmpfs on trusty
-    case $tmpfs_ensure {
-        'present': { $mount_tmpfs = 'mounted' }
-        default: { $mount_tmpfs = 'absent' }
-    }
-    mount { $ganglia_tmp_mountpoint:
-        ensure  => $mount_tmpfs,
-        require => File[$ganglia_tmp_mountpoint],
-        device  => 'tmpfs',
-        fstype  => 'tmpfs',
-        options => 'noauto,noatime,defaults,size=4000m',
-        pass    => 0,
-        dump    => 0,
-    }
-
-    file { "${ganglia_tmp_mountpoint}/rrds.pmtpa":
-        ensure  => directory,
-        require => Mount[$ganglia_tmp_mountpoint],
-        mode    => '0755',
-        owner   => 'nobody',
-        group   => 'root',
-    }
-}
-
 # == Class ganglia::logtailer
 #
 # The class pulls in everything necessary to get a ganglia-logtailer instance

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifaaff93efebe107bdf9ae2cbb35e97bcf384b830
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to