vagrant-g5k 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86aa6692b587f6dafb5af922cd68f0093ef881dd
-  data.tar.gz: 34f959c39976c1a691fff4a56dea00936833f933
+  metadata.gz: d881ded22e0ffd6c634d6404ee9b0b6d2216cc6b
+  data.tar.gz: 7191c5867fce7ff80f0216b10f5129891fc31bab
 SHA512:
-  metadata.gz: e830af79549e92e5eeea46ac5f916614da5f289e4660e5a5889975b97c2ae1f506ee314434834ed8f0e3e35d51165d36072da3ffd88866ee3e6b660429342ff6
-  data.tar.gz: 20e48f9704439fbe1b60a20e88244c4e31cf190ae837fa5b9e293848f4b9ad2a185b94af2c4423662a7780bbfe2ced3086c8ca5b7a723e78070fd058ed411d44
+  metadata.gz: 25932a96059c4e8afe177439e258b55a933a188c08975b96f7eee3d2b0290f0ebb316ab4bd5e40ba53b4c31dde8d46e798c070ada62667cd4841e5b6e7242832
+  data.tar.gz: 2700541904729a15a3e2344ec26ec4f4ca82a6212e34635cf18d749cc40510e82a10b362af0210b45a2cff65d6eaabdf0d363f0a255302e5619b2c6dc11a029f

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

@@ -19,7 +19,8 @@ module VagrantPlugins
              :username => env[:machine].provider_config.username,
              :image_location => env[:machine].provider_config.image_location, 
              :site => env[:machine].provider_config.site,
-             :ports => env[:machine].provider_config.ports
+             :ports => env[:machine].provider_config.ports,
+             :backing_strategy => env[:machine].provider_config.backing_strategy
           )
           @app.call(env)
         end

data/lib/vagrant-g5k/config.rb

@@ -18,29 +18,23 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :image_location
 
-      # G5K image location (path)
-      #
-      # @return [String]
-      attr_accessor :image_type
-
-      # G5K image strategy
-      # 
-      #
-      # @return [String]
-      attr_accessor :image_strategy
-
       # G5K ports mapping
       # 
       #
       # @return [Array]
       attr_accessor :ports
 
+      # G5K backing strategy
+      # 
+      #
+      # @return [String]
+      attr_accessor :backing_strategy
+
       def initialize()
         @username     = nil
         @image_location = nil
         @site = "rennes"
-        @image_type     = "local"
-        @image_strategy = "snapshot"
+        @backing_strategy = ""
       end
 
       def finalize!()

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

@@ -30,6 +30,9 @@ module VagrantPlugins
 
       attr_accessor :ports
 
+      attr_accessor :backing_strategy
+
+      # legacy
       @@locations = [
         {
           :path => "/grid5000/virt-images",
@@ -97,7 +100,10 @@ module VagrantPlugins
         # Generate partial arguments for the kvm command
         drive = _generate_drive()
         net = _generate_net()
-        args = [drive, net].join(" ")
+        # TODO implement different backing strategy
+        snapshot_flag = "-snapshot" if @backing_strategy == "snapshot"
+
+        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

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

@@ -37,7 +37,7 @@ trap clean_shutdown 12
 # Launch virtual machine
 #kvm -m $VM_MEM -smp $SMP -drive file=/grid5000/images/KVM/alpine_docker.qcow2,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/alpine_docker_vm.mon,server,nowait -localtime -enable-kvm &
 #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 -snapshot -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 $@ &
+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 $@ &
 
 wait
 

data/lib/vagrant-g5k/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module G5K
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-g5k
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Matthieu Simonin
@@ -129,8 +129,6 @@ files:
 - lib/vagrant-g5k.rb
 - lib/vagrant-g5k/.config.rb.swp
 - lib/vagrant-g5k/action.rb
-- lib/vagrant-g5k/action/.connect_g5k.rb.swp
-- lib/vagrant-g5k/action/.read_ssh_info.rb.swp
 - lib/vagrant-g5k/action/connect_g5k.rb
 - lib/vagrant-g5k/action/create_local_working_dir.rb
 - lib/vagrant-g5k/action/delete_job.rb