vagrant-g5k 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d158ce0d54f8e090799534b2c550410eda599144
-  data.tar.gz: c994af3cd0e9b61e99f5e48cb33296aace5a466c
+  metadata.gz: 8a9e7158fb0a28232d4f6fe3192e084eeaf108b0
+  data.tar.gz: 5f370230fa6be8d380b5d533a44601d5d6495d70
 SHA512:
-  metadata.gz: 4767c62efa6f4f085314bdd9902606c280a54ba406a9eda704903bca6523544a29d229e416a76ee92a62257de1b73c5ea5059527164487b60f285e84953cc121
-  data.tar.gz: 4668779eac6a34ad3e8441ede897693a4a8dc8472ea6bfda4d5cf7c5a72a94d522dba01ad15d38e611a40c6d9c30d26a3ec0f30b7aa46cae199c5114033a94c1
+  metadata.gz: c6be9badcea2c58faee6a889ee411747054c0f4b055be2203bced2af146cf2a05324cd947ab71265a92a948f6fb9c174a38f91dcefe5afdbb42974b9b06a8056
+  data.tar.gz: 7c8e9585c89d6db45eba4b1f56c027208f652f21c3db1553a8424dcab3a494fee3d62e6733b10269a499374a207278c1f36d5fc2d9677dcd97ed783c3f3a6618

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.9.8
+
+  * Fix wrong monitor socket path when OAR job is killed
+  [[-]](https://github.com/msimonin/vagrant-g5k/commit/eb03586257210350f237db8c22005ff877de1051)
+
 # 0.9.7
 
   * Fix vagrant 1.9.5 compatibility. Note that it breaks compatibility with older version of

data/README.md

@@ -102,9 +102,28 @@ mount -t 9p -o trans=virtio hostshare /g5k -oversion=9p2000.L
 
 Virtual Machines can be booted either :
 
-* From a `qcow2` image stored in the frontend filesystem
+* From a `qcow2` image stored in the frontend filesystem : 
+
+```
+g5k.image = {
+  :path     => # path to the image (absolute or reltive to the user home)
+  :strategy => # strategy to use (see below)
+}
+```
+
 * From a rbd image stored in one of the ceph cluster of Grid'5000.
 
+```
+g5k.image = {
+  :pool     => # ceph pool to use 
+  :rbd      => # rbd in the pool to use
+  :conf     => # path to the ceph config file
+  :id       => # id to use to contact ceph
+  :strategy => # strategy to use (see below)
+}
+```
+
+
 Once the base image is chosen, you can pick one of the following strategy
 to back the disk image of the virtual machines :
 

data/Vagrantfile

@@ -36,7 +36,7 @@ Vagrant.configure(2) do |config|
 
       # Image backed on the frontend filesystem
       g5k.image = {
-        :path    => "/home/msimonin/public/conpaas-2.1.0-openstack-kvm.img",
+        :path    => "/home/msimonin/public/debian-8.7-amd64-bento.qcow2",
         :backing => "snapshot"
       }
 
@@ -75,9 +75,8 @@ Vagrant.configure(2) do |config|
     # This defines a VM
     # If you want to use a local virtual machine (vbox, libvirt...)
     # add your vagrant options below as usual.
-    (0..10).each do |i|
-      config.vm.define "test-#{i}" do |my|
-        my.vm.box = "dummy"
-      end
+    config.vm.define "test" do |my|
+      my.vm.box = "dummy"
     end
+
 end

data/lib/vagrant-g5k/util/launch_vm.sh

@@ -73,7 +73,7 @@ export TMPDIR=/tmp
 # Clean shutdown of the VM at the end of the OAR job
 clean_shutdown() {
   echo "Caught shutdown signal at $(date)"
-  echo "system_powerdown" | nc -U /tmp/vagrant-g5k.mon
+  echo "system_powerdown" | nc -U /tmp/vagrant-g5k.$OAR_JOB_ID.mon
 }
 
 trap clean_shutdown 12

data/lib/vagrant-g5k/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module G5K
-    VERSION = '0.9.7'
+    VERSION = '0.9.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-g5k
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Matthieu Simonin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iniparse
@@ -135,7 +135,6 @@ files:
 - README.md
 - Vagrantfile
 - Vagrantfile.multi
-- Vagrantfile.old
 - dummy.box
 - examples/gitlab/Vagrantfile
 - examples/gitlab/main.yml
@@ -182,7 +181,6 @@ files:
 - locales/en.yml
 - spec/vagrant-g5k/config_spec.rb
 - spec/vagrant-g5k/oar_spec.rb
-- test/Vagrantfile
 - vagrant-g5k.gemspec
 homepage: https://github.com/msimonin/vagrant-g5k
 licenses:

data/Vagrantfile.old

@@ -1,79 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-# Sample Vagrantfile
-#
-
-# Allow to mount the home directory of G5k inside the VM
-$script = <<SCRIPT
-mkdir /g5k
-mount -t 9p -o trans=virtio hostshare /g5k -oversion=9p2000.L
-SCRIPT
-
-Vagrant.configure(2) do |config|
-
-    config.vm.provider "g5k" do |g5k, override|
-      # This is mandatory for the shared folders to work correctly
-      override.nfs.functional = false
-      # vagrant-g5k only supports rsync shared folders
-      override.vm.synced_folder ".", "/vagrant", type: "rsync", disabled: false
-
-      override.ssh.insert_key = false
-
-      # Mount the home dir
-      override.vm.provision "shell", inline: $script
-      # project id must be unique accross all
-      # your projects using vagrant-g5k to avoid conflict
-      # on vm disks
-      g5k.project_id = "test-vagrant-g5k"
-
-      #g5k.site = "igrida"
-      g5k.site = "rennes"
-      g5k.username = "msimonin"
-      g5k.gateway = "access.grid5000.fr"
-      g5k.walltime = "01:00:00"
-      #g5k.private_key = "your private key"
-
-      # Image backed on the frontend filesystem
-      g5k.image = {
-        :path    => "/home/msimonin/public/debian-8.7-amd64-bento.qcow2",
-        :backing => "snapshot"
-      }
-
-      ## Bridged network : this allow VMs to communicate
-      #g5k.net = {
-      #  :type => "bridge"
-      #}
-
-      ## Nat network : VMs will only have access to the external world
-      ## Forwarding ports will allow you to access services hosted inside the
-      ## VM.
-      g5k.net = {
-        :type => "nat",
-        :ports => ["2222-:22"]
-      }
-
-      ## OAR selection of resource
-      g5k.oar = "virtual != 'none'"
-      #g5k.oar = "virtual != 'None' and network_address in ('paranoia-2.rennes.grid5000.fr')"
-      #g5k.oar = "network_address in ('igrida12-12.irisa.fr')"
-
-      ## VM size customization default values are
-      ## cpu => -1 -> all the cpu of the reserved node
-      ## mem => -1 -> all the mem of the reserved node
-      ##
-      g5k.resources = {
-        :cpu => 1,
-        :mem => 2048
-      }
-      g5k.job_container_id = "907864"
-    end #g5k
-
-    # This defines a VM
-    # If you want to use a local virtual machine (vbox, libvirt...)
-    # add your vagrant options below as usual.
-    config.vm.define "test" do |my|
-      my.vm.box = "dummy"
-    end
-
-end

data/test/Vagrantfile

@@ -1,46 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-# Sample Vagrantfile
-#
-Vagrant.configure(2) do |config|
-
-      config.vm.provider "g5k" do |g5k, override|
-        override.nfs.functional = false
-        g5k.project_id = "test-vagrant-g5k"
-        g5k.site = "rennes"
-        g5k.username = "msimonin"
-        g5k.gateway = "access.grid5000.fr"
-        g5k.walltime = "00:10:00"
-        g5k.image = {
-          :path    => "/home/msimonin/public/ubuntu1404-9p.qcow2",
-          :backing => "snapshot"
-        }
-        g5k.net = {
-          :type => "bridge",
-#            :ports => ["#{2222+i}-:22"]
-        }
-        g5k.oar = "virtual != 'none'"
-        g5k.resources = {
-          :cpu => 1,
-          :mem => 2048
-        }
-      end #g5k
-
-    ## This define a VM.
-    ## a g5k provider section will override top level options
-    ## To define multiple VMs you can
-    ## * either repeat the block
-    ## * loop over using (1..N).each block
-    (1..10).each do |i|
-      config.vm.define "test-#{i}" do |my|
-        my.vm.box = "dummy"
-        ## Configure the shared folders between your host and the VM
-        my.vm.synced_folder ".", "/vagrant", type: "rsync", disabled: false
-        ## This is mandatory until #6 is fixed
-        ## In particular this is needed for the shared folders
-        my.ssh.insert_key = false
-      end #vm
-    end
-
-end