vagrant-g5k 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5481fa32957d639e07e8ef7bfdaffc9f47026d95
-  data.tar.gz: 754180507384aa297d4917d46571f2f2fb8cb2cc
+  metadata.gz: aaeed73b05202f3f4877d8b66401981199f0cafb
+  data.tar.gz: 91014ed7c211013ce70fb7fc6fa58bd77cd9d336
 SHA512:
-  metadata.gz: ac6517dcd596bb8339cfd1c2a82cf47495be661c71711505fbbe5f0f6763c097124c879fd7c52c3d17191d6a4dd5baee4055e54932159ae1a23ad82e53e50fba
-  data.tar.gz: f5eefaba927d55b1df4c724a123ef3537d62c668c6fc9afe001ef3b217b213871a5710b1f5a19ed54e5a91350ecfaa81acd4b94374f05db01ba0faa0d943fd02
+  metadata.gz: 0b0874066b83dfc35b9ff5fed4eedbe9a4746266c43d24f40a1aa5db8ca3821d5b4857b5bc119657f4e727dd4312c0837d881d346f6f346579635ea16653e466
+  data.tar.gz: 5ad397d2195e17abac2199953ced8b7674823cecec82084fd8dd5f9e5c804b7371cfa53a5287da4a78a077330721c6cf5066454b66ddb1d17a541ae153ed6a4e

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+# 0.0.14
+
+  * current
+
 # 0.0.13
 
-  * Current
+  * Let vagrant configure the private_key to use to connect to the VM
 
 # 0.0.12
 

data/Vagrantfile

@@ -57,6 +57,11 @@ Vagrant.configure(2) do |config|
 
       # ports to expose (at least ssh has to be forwarded)
       g5k.ports = ['2222-:22']
+
+      # Custom oar ressource filtering
+      # This may be specific on the oar ressource declaration 
+      # of the used platform
+      # g5k.oar = "virtual != 'none'"
     end
 
 

data/lib/vagrant-g5k/config.rb

@@ -46,12 +46,19 @@ module VagrantPlugins
       # @return [Array]
       attr_accessor :ports
 
+      # OAR resource selection
+      # 
+      #
+      # @return [String]
+      attr_accessor :oar
+
       def initialize()
         @username         = ENV['USER']
         @project_id       = nil
         @site             = nil
         @gateway          = nil
         @walltime         = "01:00:00"
+        @oar              = ""
       end
 
       def finalize!()

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

@@ -39,6 +39,8 @@ module VagrantPlugins
 
       attr_accessor :ports
 
+      attr_accessor :oar
+
       @@instance = nil
 
       def self.instance
@@ -57,6 +59,7 @@ module VagrantPlugins
         @ports = @provider_config.ports
         @image= @provider_config.image
         @gateway = @provider_config.gateway
+        @oar = "{#{@provider_config.oar}}/" if @provider_config.oar != ""
         # grab the network config of the vm
         @networks = env[:machine].config.vm.networks
         # to log to the ui
@@ -157,7 +160,7 @@ module VagrantPlugins
         args = [drive, net].join(" ")
         # Submitting a new job
         # Getting the job_id as a ruby string
-        job_id = exec("oarsub --json -t allow_classic_ssh -l \"nodes=1,walltime=#{@walltime}\" --name #{env[:machine].name} --checkpoint 60 --signal 12  \"#{launcher_remote_path} #{args}\" | grep \"job_id\"| cut -d':' -f2").gsub(/"/,"").strip
+        job_id = exec("oarsub --json -t allow_classic_ssh -l \"#{@oar}nodes=1,walltime=#{@walltime}\" --name #{env[:machine].name} --checkpoint 60 --signal 12  \"#{launcher_remote_path} #{args}\" | grep \"job_id\"| cut -d':' -f2").gsub(/"/,"").strip
 
         begin
           retryable(:on => VagrantPlugins::G5K::Errors::JobNotRunning, :tries => 100, :sleep => 2) do
@@ -174,7 +177,7 @@ module VagrantPlugins
           @ui.error("Tired of waiting")
           raise VagrantPlugins::G5K::Errors::JobNotRunning
         end
-        @ui.info("VM booted on #{@site}")
+        @ui.info("VM booted @#{@site} on #{@node}")
 
       end
 

data/lib/vagrant-g5k/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module G5K
-    VERSION = '0.0.13'
+    VERSION = '0.0.14'
   end
 end

metadata

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