vagrant-g5k 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e0e51fdb1bc354bce80d807d3b6c7500aa32e61
-  data.tar.gz: f326ea37cee6bc501848b8deafda61af85a320a7
+  metadata.gz: bad549f807cf2aa5b7c6bc5bef799e00ea8bc5e7
+  data.tar.gz: 8b56db026b2a0712f338a8a983c6540bfa8ed865
 SHA512:
-  metadata.gz: 0e632af665f7c61884dd62b0a105114fbe3a2896f848d66174cf09a79b394c6d365a04be4431e1c9425391c34a8d94d9e85ead25b516f691ef8950fa5175a2f0
-  data.tar.gz: 8a67e80906ff550ed7befb257224cafdc01a613f7bc989889e552b46d4b046758dbb155fade5aca2eca7d3a618f174988255042a8a5f75da5368262b9cb1dd17
+  metadata.gz: c4cec907465a00958ab204513169098326701d52b1b19869b78dba7864739a394c260c5c3844b28db9c4d3d6f1007fe65e0bfbeb12dc467e3d22f2723d2afefd
+  data.tar.gz: 7214b015047e8ec53868471c99477e6054a6543dc8ae0920a28c64b41e0128951c846c1e63faa38d248c9c6abd69331fff6e925996d65005cb6d68c5f3674b0f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.9.1
+
+  * Allow custom cpu and memory demands.
+
 # 0.9.0
 
   * Code refactoring : 

data/README.md

@@ -1,3 +1,5 @@
+> The plugin is updated often, this may include breaking changes.
+
 # Vagrant G5K Provider
 This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds an [G5K](https://www.grid5000.fr)
 provider to Vagrant, allowing Vagrant to control and provision **virtual machines** on Grid5000.

data/Vagrantfile

@@ -1,9 +1,8 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 #
-# Testing purpose only
-#Vagrant.require_plugin "vagrant-g5k"
-
+# Sample Vagrantfile
+#
 Vagrant.configure(2) do |config|
 
     config.vm.provider "g5k" do |g5k|
@@ -16,49 +15,64 @@ Vagrant.configure(2) do |config|
       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 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"
-#      }
+      g5k.image = {
+        :path    => "/grid5000/virt-images/alpine_docker.qcow2",
+        :backing => "copy"
+      }
 
-#       g5k.net = {
-#        :type => "bridge"
-#      }
+      ## 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
+      ## OAR selection of resource
       g5k.oar = "virtual != 'none'"
-    end #g5k
 
+      ## 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
 
-    (1..1).each do |i|
-      config.vm.define "vm#{i}" do |my|
-        my.vm.box = "dummy"
-
-#        my.ssh.username = "root"
-#        my.ssh.password = ""
+    ## 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
-    # Repeat block to define another vm 
-    # config.vm.define "vm2" do |my|
-    #   
-    # end
+    end #vm
 
 end
 

data/lib/vagrant-g5k/config.rb

@@ -52,6 +52,12 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :oar
 
+      # VM resource demand
+      #
+      #
+      # @return [Hash]
+      attr_accessor :resources
+
       def initialize()
         @username         = ENV['USER']
         @project_id       = nil
@@ -60,13 +66,19 @@ module VagrantPlugins
         @walltime         = "01:00:00"
         @oar              = ""
         @net              = {
-          :type => 'nat',
-          :ports => ['2222-:22']
+          :type => 'nat'
+        }
+        @resources        = {
         }
       end
 
       def finalize!()
-        # This is call by the plugin mecanism after initialize
+        # set default ssh redirection
+        if @net[:type] == 'nat' && @net[:ports].nil?
+          @net[:ports] = ["2222-:22"]
+        end
+        @resources[:cpu] = -1 if @resources[:cpu].nil?
+        @resources[:mem] = -1 if @resources[:mem].nil?
       end
 
 
@@ -78,6 +90,7 @@ module VagrantPlugins
         errors << "g5k image is required" if @image.nil?
         errors << "g5k image must be a Hash" if !@image.is_a?(Hash)
         errors << "g5k net must be a Hash" if !@net.is_a?(Hash)
+        errors << "g5k resources must be a Hash" if !@resources.is_a?(Hash)
 
         { "G5K Provider" => errors }
       end

data/lib/vagrant-g5k/g5k_connection.rb

@@ -28,7 +28,8 @@ module VagrantPlugins
         @walltime = @provider_config.walltime
         @image= @provider_config.image
         @oar = "{#{@provider_config.oar}}/" if @provider_config.oar != ""
-
+        @resources = @provider_config.resources
+        @oar_unit = init_oar_unit(@resources[:cpu], @resources[:mem])
         @cwd = cwd
         @driver = driver
         @oar_driver = oar_driver
@@ -36,6 +37,15 @@ module VagrantPlugins
         @disk_driver = disk_driver
       end
 
+      def init_oar_unit(cpu, mem)
+        if cpu != -1 and mem != -1
+          unit = "core=#{cpu}"
+        else
+          unit = "nodes=1"
+        end
+        return unit
+      end
+
 
       def create_local_working_dir()
         exec("mkdir -p #{@cwd}")
@@ -86,12 +96,19 @@ module VagrantPlugins
         net = @net_driver.generate_net()
         drive = _generate_drive(env)
         
-        args = [net, drive].join(" ")
+        args = [@resources[:cpu], @resources[:mem], net, drive].join(" ")
         # Submitting a new job
         # Getting the job_id as a ruby string
+        options = []
+
+        if @oar_unit =~ /core/
+          # allow classic ssh only work when the node is reserved as a whole
+          # this implies that nat networking won't work when core is the unit of
+          # deployment
+          options << '-t allow_classic_ssh'
+        end
         options = [
-          "-t allow_classic_ssh",
-          "-l \"#{@oar}nodes=1, walltime=#{@walltime}\"",
+          "-l \"#{@oar}#{@oar_unit}, walltime=#{@walltime}\"",
           "--name #{env[:machine].name}",
           "--checkpoint 60",
           "--signal 12"

data/lib/vagrant-g5k/oar.rb

@@ -78,7 +78,7 @@ module VagrantPlugins
       def _process_errors(job_id)
         job = check_job(job_id)
         stderr_file = job["stderr_file"]
-        stderr = exec("cat #{stderr_file}")
+        stderr = @driver.exec("cat #{stderr_file}")
         @ui.error("#{stderr_file}:  #{stderr}")
         raise VagrantPlugins::G5K::Errors::JobError
       end

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

@@ -4,8 +4,15 @@
 # Thanks to him !
 # I've made some addition though :) 
 
-# 
+# ARGS
+# $1: cpu demand
+# $2: mem demand
+# $3: net type {BRIDGE, NAT}
+# BRIDGE | NAT
+# $4 subnet_file  | $left other net, drive options
+# $left net/drive options
 
+set -x
 
 function net_bridge() {
   SUBNET_FILE=$1
@@ -23,6 +30,29 @@ function net_bridge() {
   echo "-net nic,model=virtio,macaddr=$MAC_ADDR -net tap,ifname=$TAP,script=no"
 }
 
+# CPU demand
+if [ "$1" == "-1" ]
+then
+  SMP=$(nproc)
+else
+  SMP=$1
+fi
+echo "SMP = $SMP"
+shift
+
+# Memory demand
+KEEP_SYSTEM_MEM=1 # Gb
+if [ "$1" == "-1" ]
+then
+  TOTAL_MEM=$(cat /proc/meminfo | grep -e '^MemTotal:' | awk '{print $2}')
+  VM_MEM=$(( ($TOTAL_MEM / 1024) - $KEEP_SYSTEM_MEM * 1024 ))
+else
+  VM_MEM=$1
+fi
+echo "VM_MEM = $VM_MEM"
+shift
+
+# net demand
 net=""
 if [ "$1" == "BRIDGE" ]
 then
@@ -40,14 +70,6 @@ fi
 # Directory for qcow2 snapshots
 export TMPDIR=/tmp
 
-# Memory allocation
-KEEP_SYSTEM_MEM=1 # Gb
-TOTAL_MEM=$(cat /proc/meminfo | grep -e '^MemTotal:' | awk '{print $2}')
-VM_MEM=$(( ($TOTAL_MEM / 1024) - $KEEP_SYSTEM_MEM * 1024 ))
-
-# CPU
-SMP=$(nproc)
-
 # Clean shutdown of the VM at the end of the OAR job
 clean_shutdown() {
   echo "Caught shutdown signal at $(date)"
@@ -57,8 +79,7 @@ clean_shutdown() {
 trap clean_shutdown 12
 
 # Launch virtual machine
-#kvm -m $VM_MEM -smp $SMP -drive file=$IMAGE,if=virtio -snapshot -fsdev local,security_model=none,id=fsdev0,path=$HOME -device virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=hostshare -nographic -net nic,model=virtio,macaddr=$MAC_ADDR -net tap,ifname=$TAP,script=no -monitor unix:/tmp/vagrant-g5k.mon,server,nowait -localtime -enable-kvm &
-kvm -m $VM_MEM -smp $SMP -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.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.0'
+    VERSION = '0.9.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-g5k
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Matthieu Simonin