Merge pull request #21 from grid5000/fix_ganglia

[big] Fix ganglia bug 7748

Author: dloup

virtualbox/jessie-x64-common.yaml

@@ -31,7 +31,7 @@ global:
   variant: min # default value for variant. Can be overwritten by --global=variant:<my_variant> when calling kameleon
   os_family: debian
   os_release: jessie
-  image_version: 2017011315
+  image_version: 2017020113
   output: "$${kameleon_cwd}/$${kameleon_recipe_name}" # output files basename
   g5k_tgz_path: server:///path/to/your/image
   g5k_postinst_path: server:///grid5000/postinstalls/debian-x64-min-1.2-post.tgz

virtualbox/steps/data/puppet/modules/env/files/big/nvidia/ganglia-monitor.service

@@ -0,0 +1,25 @@
+# INSTALLED BY PUPPET
+
+[Unit]
+SourcePath=/etc/init.d/ganglia-monitor
+Description=(null)
+Before=runlevel2.target runlevel3.target runlevel4.target runlevel5.target shutdown.target
+After=network-online.target nss-lookup.target remote-fs.target systemd-journald-dev-log.socket
+Wants=network-online.target
+Conflicts=shutdown.target
+
+[Service]
+Type=forking
+Restart=no
+TimeoutSec=5min
+IgnoreSIGPIPE=no
+KillMode=process
+GuessMainPID=no
+RemainAfterExit=yes
+SysVStartPriority=2
+ExecStartPre=/bin/bash -c "[[ $(lsmod | grep -ic nvidia) -eq 0 ]] && rm -f /etc/ganglia/conf.d/{nvidia.pyconf,modpython-nvidia.conf}"
+ExecStart=/etc/init.d/ganglia-monitor start
+ExecStop=/etc/init.d/ganglia-monitor stop
+
+[Install]
+WantedBy=multi-user.target

virtualbox/steps/data/puppet/modules/env/manifests/big/configure_nvidia_gpu/ganglia.pp

@@ -25,6 +25,17 @@
           mode    => '0644',
           source  => "puppet:///modules/env/big/nvidia/modpython-nvidia.conf",
           require => Package['ganglia-monitor-python-nvidia'];
+        '/etc/systemd/system/ganglia-monitor.service':
+          ensure  => file,
+          owner   => root,
+          group   => root,
+          mode    => '0644',
+          source  => "puppet:///modules/env/big/nvidia/ganglia-monitor.service";
+      }
+      exec {
+       'Enable ganglia on startup':
+         command => "systemctl enable ganglia-monitor",
+         path    => ['/bin','/usr/bin','/sbin'];
       }
     }
     default: {

virtualbox/steps/data/puppet/modules/env/manifests/big/install_ceph/apt.pp

@@ -20,8 +20,8 @@
       owner   => root,
       group   => root,
       content => "# ceph
-deb http://ceph.com/debian-${version}/ ${::lsbdistcodename} main
-deb-src http://ceph.com/debian-${version}/ ${::lsbdistcodename} main";
+deb http://download.ceph.com/debian-${version}/ ${::lsbdistcodename} main
+deb-src http://download.ceph.com/debian-${version}/ ${::lsbdistcodename} main";
   }
 
   Exec['import_ceph_apt_key'] -> File['/etc/apt/sources.list.d/ceph.list'] ~> Exec['/usr/bin/apt-get update']

virtualbox/steps/data/puppet/modules/env/manifests/std/install_g5kchecks.pp

@@ -3,7 +3,7 @@
   include 'env::std::ipmitool' # ipmitool is required by g5k-checks
   include 'env::std::dell'     # dell tools are required by g5k-checks
 
-  $g5kchecks_version = "0.7.5"
+  $g5kchecks_version = "0.7.8"
 
   $g5kchecks_deps = [ 'ruby-rest-client', 'ohai', 'ruby-popen4', 'fio', 'ruby-json', 'x86info' ]
   case $operatingsystem {