vagrant-g5k 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bad549f807cf2aa5b7c6bc5bef799e00ea8bc5e7
-  data.tar.gz: 8b56db026b2a0712f338a8a983c6540bfa8ed865
+  metadata.gz: 66d54d0bd6561de0ae64704dd3d193bc33c9315c
+  data.tar.gz: cf831d202c096f406b2e5bd6fc28096f8aa041a4
 SHA512:
-  metadata.gz: c4cec907465a00958ab204513169098326701d52b1b19869b78dba7864739a394c260c5c3844b28db9c4d3d6f1007fe65e0bfbeb12dc467e3d22f2723d2afefd
-  data.tar.gz: 7214b015047e8ec53868471c99477e6054a6543dc8ae0920a28c64b41e0128951c846c1e63faa38d248c9c6abd69331fff6e925996d65005cb6d68c5f3674b0f
+  metadata.gz: aae8a2021bc6d8aa4fa49e2c9756a896a7170dbb75b15886f47d8eeef45aa02fdcfff91309c7913948ade786b230ae91d0b06bfdbd9e1394ddae7d2ad9a121f8
+  data.tar.gz: 27845918e8cb2457d69c89a20f97dc9236473b918087fd70a1276e5692c87a790556c6353a8f15459c55851c04b6f98b62e61b45bf9e26540eea4bf1011e4740

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.9.2
+
+  * Make the monitor socket location unique
+
 # 0.9.1
 
   * Allow custom cpu and memory demands.

data/README.md

@@ -51,8 +51,8 @@ The outside world can access the VMs on dedicated ports that are mapped in the h
 config.vm.provider "g5k" do |g5k|
   [...]
   g5k.net = {
-    "type": "nat",
-    "ports": ["2222-:22", "8080-":80]
+    :type  => "nat",
+    :ports => ["2222-:22", "8080-":80]
   }
 end
 ```
@@ -65,13 +65,28 @@ e.g : Assuming `parapluie-1.rennes.grid5000.fr` hosts the VM. A SSH tunnel from
 config.vm.provider "g5k" do |g5k|
   [...]
   g5k.net = {
-    "type": "bridge"
+    :type => "bridge"
   }
 end
 ```
 
 > Due to the dynamic nature of the subnet reserved on Grid'5000, IPs of the VMs will change accross reboots
 
+## Note on resource demand
+
+CPU and memory demand can be ajusted with the following in your Vagrantfile.
+
+```
+config.vm.provider "g5k" do |g5k|
+  [...]
+  g5k.resource = {
+    :cpu => 2,
+    :mem => 4096
+  }
+end
+```
+You can use `:cpu => -1` to express that you want all the cpu of the reserved node (but not necesseraly all the memory). Similarly `:mem => -1` will give you all the memory available on the reserved node. These are the default values.
+
 
 ## Supported operations
 

data/Vagrantfile

@@ -3,77 +3,48 @@
 #
 # Sample Vagrantfile
 #
+N = 3
 Vagrant.configure(2) do |config|
 
-    config.vm.provider "g5k" do |g5k|
-      # project id must be unique accross all
-      # your projects using vagrant-g5k to avoid conflict 
-      # on vm disks
-      g5k.project_id = "vagrant-g5k"
-      g5k.site = "rennes"
-      g5k.username = ENV["USER"]
-      g5k.gateway = "access.grid5000.fr"
-      g5k.walltime = "01:00:00"
-
-      ## Image backed by the ceph cluster
-      #g5k.image = {
-      #   :pool      => "msimonin_rbds",
-      #   :rbd       => "bases/ubuntu1404-9p",
-      #   :snapshot  => "parent",
-      #   :id        => "$USER",
-      #   :conf      => "$HOME/.ceph/config",
-      #   :backing   => "copy"
-      #}
-
-      # Image backed on the frontend filesystem           
-      g5k.image = {
-        :path    => "/grid5000/virt-images/alpine_docker.qcow2",
-        :backing => "copy"
-      }
-
-      ## 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'"
-
-      ## 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
-      #}
-    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
-    config.vm.define "vm" do |my|
-      my.vm.box = "dummy"
-      
-      ## Access to the vm
-      ## This is specific to alpine_docker
-      ## It's better to use a vagrant image
-      ## converted to qcow2
-      my.ssh.username = "root"
-      my.ssh.password = ""
-
-    end #vm
-
-end
+    (1..N).each do |i| 
+      config.vm.define "vm#{i}" do |my|
+        my.vm.box = "dummy"
+        
+        ## Access to the vm
+        ## This is specific to alpine_docker
+        ## It's better to use a vagrant image
+        ## converted to qcow2
+        my.ssh.username = "root"
+        my.ssh.password = ""
+        my.vm.provider "g5k" do |g5k|
+          g5k.project_id = "vagrant-g5k"
+          g5k.site = "lille"
+          g5k.username = ENV["USER"]
+          g5k.gateway = "access.grid5000.fr"
+          g5k.walltime = "01:00:00"
+          g5k.image = {
+            :path    => "public/alpine_docker.qcow2",
+            :backing => "snapshot"
+          }
+          g5k.net = {
+            :type => "nat",
+            :ports => ["222#{i}-:22"]
+          }
+
+          g5k.oar = "virtual != 'none'"
+
+          g5k.resources = {
+            :cpu => 1,
+            :mem => 2048
+          }
+        end #g5k
+      end
+    end
+  end
 
 

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

@@ -79,7 +79,7 @@ clean_shutdown() {
 trap clean_shutdown 12
 
 # Launch virtual machine
-kvm -m $VM_MEM -smp cores=$SMP,threads=1,sockets=1 -fsdev local,security_model=none,id=fsdev0,path=$HOME -device virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=hostshare -nographic -monitor unix:/tmp/vagrant-g5k.mon,server,nowait -localtime -enable-kvm $net $@ &
+kvm -m $VM_MEM -smp cores=$SMP,threads=1,sockets=1 -fsdev local,security_model=none,id=fsdev0,path=$HOME -device virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=hostshare -nographic -monitor unix:/tmp/vagrant-g5k.$OAR_JOB_ID.mon,server,nowait -localtime -enable-kvm $net $@ &
 
 wait
 

data/lib/vagrant-g5k/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module G5K
-    VERSION = '0.9.1'
+    VERSION = '0.9.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-g5k
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Matthieu Simonin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iniparse