vagrant-g5k 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 043f3958657451cc6b632023f0d8af571b172a61
-  data.tar.gz: 80ef66e4918d63bfefb0f27878c9d5ce4348fb5d
+  metadata.gz: 71442ce64f1bd79dfaa907ed185ed54bc24a491e
+  data.tar.gz: abbd6a67d44e02459384e9900679c8da373286ae
 SHA512:
-  metadata.gz: cb8a65146f1752975ddb92363f47c1af6f63d6893b2a041c6aab2a700eeccf5937f4fb0ae751115fe8d3c3b8aec282d1cf4fbb689144987e429e978427b55fee
-  data.tar.gz: d724bd697b85cc1d674ba8a2ab744a29af278ffc08fcb2c70742dac5144cfb457d5a4425cbf8c7031364150a5c1fd8a03e98913e08aac03c3011d5566adc6f66
+  metadata.gz: 0816c3a1356533afbfc5e3e97cb993cd2f745230b8b169ca9389af467755cff47ab6eb1f27586ad3dea297efeff7f089ad8f989494500966cd70c840c32c9fd3
+  data.tar.gz: fde42765e24413a1fded93e330a5ca7482f932e5b7489e2a25e91dfb14663d4096710243e2db1cef2fab59cb7e6bbd378efd41c10795836e8daff86bab942e02

data/CHANGELOG.md

@@ -1,4 +1,25 @@
+# 0.0.9
+
+  * Add support for custom walltime
+
+# 0.0.8
+
+  * Add support for custom private key
+
+# 0.0.7
+
+  * Support for ephemeral / persitent backing file
+
+# 0.0.6
+
+  * SSH ports has to be forwarded explicitly
+
+# 0.0.5
+  
+  * Add destroy command
+  * Remove vmlist command
+
 # 0.0.4
 
-  * use nat-ted network provided by kvm
-  * remove hard-coded names
+  * Use nat-ted network provided by kvm
+  * Remove hard-coded names

data/Vagrantfile

@@ -18,14 +18,27 @@ Vagrant.configure(2) do |config|
     config.vm.provider "g5k" do |g5k|
       # user name used to connect to g5k
       g5k.username = ENV['USER']
+
       # private key 
       # g5k.private_key = File.join(ENV['HOME'], ".ssh/id_rsa_discovery")
+
       # site to use
       g5k.site = "rennes"
+
+      # walltime to use
+      # g5k.walltime = "02:00:00" 
+
       # image location 
       g5k.image_location = "/grid5000/virt-images/alpine_docker.qcow2"
+
       # it could be backed by the ceph
       # g5k.image_location = "rbd:msimonin_rbds/virt/alpine_docker_analyse-090916:id=msimonin:conf=/home/msimonin/.ceph/config"
+      
+      # g5k.backing_strategy = "snapshot"
+      #   this is a copy on write strategy 
+      #   image_location is use to read, an epehemeral disk will hold the writes
+      # if not specified this means that the image is used in r/w mode.
+      #   changes will be persistent
       g5k.backing_strategy = "snapshot"
       # ports to expose (at least ssh has to be forwarded)
       g5k.ports = ['2222-:22']

data/lib/vagrant-g5k/action/connect_g5k.rb

@@ -18,6 +18,7 @@ module VagrantPlugins
              :logger => env[:ui],
              :username => env[:machine].provider_config.username,
              :private_key => env[:machine].provider_config.private_key,
+             :walltime => env[:machine].provider_config.walltime,
              :image_location => env[:machine].provider_config.image_location, 
              :site => env[:machine].provider_config.site,
              :ports => env[:machine].provider_config.ports,

data/lib/vagrant-g5k/config.rb

@@ -14,6 +14,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :private_key
 
+      # G5K walltime
+      #
+      # @return [String]
+      attr_accessor :walltime
+
       # G5K site
       #
       # @return [String]
@@ -40,6 +45,7 @@ module VagrantPlugins
         @image_location = nil
         @site = "rennes"
         @backing_strategy = ""
+        @walltime = "01:00:00"
       end
 
       def finalize!()

data/lib/vagrant-g5k/util/g5k_utils.rb

@@ -7,7 +7,6 @@ require 'vagrant/util/retryable'
 WORKING_DIR = ".vagrant-g5k"
 LAUNCHER_SCRIPT = "launch_vm_fwd.sh"
 JOB_SUBNET_NAME = "vagrant-g5k-subnet"
-WALLTIME="01:00:00"
 
 module VagrantPlugins
   module G5K
@@ -22,6 +21,8 @@ module VagrantPlugins
 
       attr_accessor :site
 
+      attr_accessor :walltime
+
       attr_accessor :image_location
 
       attr_accessor :logger
@@ -112,7 +113,7 @@ module VagrantPlugins
         args = [drive, net, snapshot_flag].join(" ")
         # Submitting a new job
         @logger.info("Starting a new job")
-        job_id = exec("oarsub -t allow_classic_ssh -l \"{virtual!=\'none\'}/nodes=1,walltime=#{WALLTIME}\" --name #{env[:machine].name} --checkpoint 60 --signal 12  \"#{launcher_remote_path} #{args}\" | grep OAR_JOB_ID | cut -d '='  -f2").chomp
+        job_id = exec("oarsub -t allow_classic_ssh -l \"{virtual!=\'none\'}/nodes=1,walltime=#{@walltime}\" --name #{env[:machine].name} --checkpoint 60 --signal 12  \"#{launcher_remote_path} #{args}\" | grep OAR_JOB_ID | cut -d '='  -f2").chomp
         
 
         begin

data/lib/vagrant-g5k/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module G5K
-    VERSION = '0.0.8'
+    VERSION = '0.0.9'
   end
 end

metadata

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