vagrant-g5k 0.9.4 → 0.9.5

data/lib/vagrant-g5k/config.rb

@@ -41,17 +41,23 @@ module VagrantPlugins
 
 
       # G5K network options
-      # 
+      #
       #
       # @return [Hash]
       attr_accessor :net
 
       # OAR resource selection
-      # 
+      #
       #
       # @return [String]
       attr_accessor :oar
 
+      # OAR job container id
+      #
+      #
+      # @return [String]
+      attr_accessor :job_container_id
+
       # VM resource demand
       #
       #
@@ -63,13 +69,14 @@ module VagrantPlugins
         @project_id       = nil
         @site             = nil
         @gateway          = nil
-        @walltime         = "01:00:00"
-        @oar              = ""
+        @walltime         = '01:00:00'
+        @oar              = ''
         @net              = {
           :type => 'nat'
         }
         @resources        = {
         }
+        @job_container_id = nil
       end
 
       def finalize!()
@@ -91,7 +98,6 @@ module VagrantPlugins
         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

@@ -23,13 +23,14 @@ module VagrantPlugins
         @logger = Log4r::Logger.new("vagrant::g5k_connection")
         @ui = env[:ui]
 
-        @provider_config = env[:machine].provider_config 
+        @provider_config = env[:machine].provider_config
         @site = @provider_config.site
         @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])
+        @job_container_id = @provider_config.job_container_id
         @cwd = cwd
         @driver = driver
         @oar_driver = oar_driver
@@ -95,19 +96,15 @@ module VagrantPlugins
         # NOTE: net is first due the the shape of the bridge launcher script
         net = @net_driver.generate_net()
         drive = _generate_drive(env)
-        
         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'
+        if !@job_container_id.nil?
+          @ui.info("Using a job container = #{@job_container_id}")
+          options << "-t inner=#{@job_container_id}"
         end
-        options = [
+        options += [
           "-l \"#{@oar}#{@oar_unit}, walltime=#{@walltime}\"",
           "--name #{env[:machine].name}",
           "--checkpoint 60",
@@ -118,7 +115,7 @@ module VagrantPlugins
         env[:machine].id = job_id
         wait_for_vm(job_id)
       end
-     
+
       def wait_for_vm(job_id)
         @oar_driver.wait_for(job_id)
         @net_driver.attach()

data/lib/vagrant-g5k/network/bridge.rb

@@ -5,7 +5,7 @@ module VagrantPlugins
     module Network
 
       class Bridge
-      
+
         include VagrantPlugins::G5K
 
         def initialize(env, driver, oar_driver)
@@ -21,7 +21,7 @@ module VagrantPlugins
         def generate_net()
           lockable(:lock => VagrantPlugins::G5K.subnet_lock) do
             subnet_job_id = _find_subnet
-            if subnet_job_id.nil? 
+            if subnet_job_id.nil?
               subnet_job_id = _create_subnet
               @oar_driver.wait_for(subnet_job_id)
               # we can't call this inside the launcher script
@@ -33,7 +33,7 @@ module VagrantPlugins
           return "BRIDGE #{_subnet_file}"
           end
         end
-      
+
         def check_state(job_id)
           subnet_job_id = _find_subnet()
           return :subnet_missing if subnet_job_id.nil?
@@ -69,7 +69,7 @@ module VagrantPlugins
         def _create_subnet()
           options = []
           options << "--name '#{@project_id}-net'"
-          options << "-l 'slash_22=1, walltime=#{@walltime}'"
+          options << "-l 'slash_18=1, walltime=#{@walltime}'"
           @oar_driver.submit_job('sleep 84400', options )
         end
 
@@ -87,10 +87,10 @@ module VagrantPlugins
           nil
         end
 
-        # Update the subnet use 
+        # Update the subnet use
         # op is a string "+" or "-"
-        # if after the update the subnet use is 0 
-        # the subnet in use is also deleted 
+        # if after the update the subnet use is 0
+        # the subnet in use is also deleted
         def _update_subnet_use(op)
           cmd = []
           cmd << "c=$(cat #{_subnet_count});"
@@ -98,7 +98,7 @@ module VagrantPlugins
           cmd << "cat #{_subnet_count}"
           count = @driver.exec(cmd.join(" "))
           @logger.info("subnet_count = #{count}")
-          if count.to_i <= 0 
+          if count.to_i <= 0
             @logger.info("deleteting the associated subnet")
             subnet_id = _find_subnet()
             @oar_driver.delete_job(subnet_id)
@@ -111,5 +111,3 @@ module VagrantPlugins
     end
   end
 end
-
-  

data/lib/vagrant-g5k/oar.rb

@@ -3,7 +3,7 @@ require 'log4r'
 module VagrantPlugins
   module G5K
     class Oar
-  
+
       include Vagrant::Util::Retryable
 
       attr_accessor :driver
@@ -13,7 +13,7 @@ module VagrantPlugins
         @driver = driver
         @ui = ui
       end
-      
+
       def submit_job(cmd, options)
         # prefix by the oarsub command
         opt = _build_oar_cmd(options)
@@ -26,7 +26,7 @@ module VagrantPlugins
       def delete_job(job_id, options = [])
         cmd = _build_oar_cmd(options)
         cmd = ["oardel", cmd, job_id].join(" ")
-        @driver.exec(cmd) 
+        @driver.exec(cmd)
       end
 
       def check_job(job_id)
@@ -49,7 +49,7 @@ module VagrantPlugins
         end
         nil
       end
-     
+
       def wait_for(job_id)
         job = nil
         begin
@@ -60,7 +60,7 @@ module VagrantPlugins
             end
             if job.nil? or (!job.nil? and job["state"] != "Running")
               @ui.info("Waiting for the job to be running")
-              raise VagrantPlugins::G5K::Errors::JobNotRunning 
+              raise VagrantPlugins::G5K::Errors::JobNotRunning
             end
             break
           end

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

@@ -2,7 +2,7 @@
 
 # This script is originally borrowed to pmorillo
 # Thanks to him !
-# I've made some addition though :) 
+# I've made some addition though :)
 
 # ARGS
 # $1: cpu demand
@@ -17,7 +17,7 @@ set -x
 function net_bridge() {
   SUBNET_FILE=$1
   # As we chose a stateless designe,let's calculate here the ip and mac
-  # assuming we got a slash_22
+  # assuming we got at least a slash_22
   ipnumber=$(($OAR_JOB_ID % 1022))
   IP_MAC=$(cat $SUBNET_FILE|head -n $((ipnumber + 1))|tail -n 1)
   IP_ADDR=$(echo $IP_MAC|awk '{print $1}')

data/lib/vagrant-g5k/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module G5K
-    VERSION = '0.9.4'
+    VERSION = '0.9.5'
   end
 end

data/test/Vagrantfile

@@ -0,0 +1,46 @@
+# -*- 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-g5k
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Matthieu Simonin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iniparse
@@ -149,6 +149,17 @@ files:
 - Vagrantfile.multi
 - Vagrantfile.old
 - dummy.box
+- examples/gitlab/Vagrantfile
+- examples/gitlab/main.yml
+- examples/htb-netem/README.md
+- examples/htb-netem/Vagrantfile
+- examples/htb-netem/ansible.cfg
+- examples/htb-netem/example_latencies.png
+- examples/htb-netem/heat.py
+- examples/htb-netem/hosts.j2
+- examples/htb-netem/setup.rb
+- examples/htb-netem/setup.yml
+- examples/htb-netem/test.yml
 - lib/vagrant-g5k.rb
 - lib/vagrant-g5k/.action.rb.swp
 - lib/vagrant-g5k/.config.rb.swp
@@ -183,6 +194,7 @@ 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: