vagrant-g5k 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14d213a2e487b13b315432d6743eeb5c07fe877e
-  data.tar.gz: f0fa3704d917e257c0062be78edd16715422c4c7
+  metadata.gz: 2356c0013be92069f4e7d3bc2987c175e20ff007
+  data.tar.gz: 2d94e08a93912a7fec591109cdee311614872cb9
 SHA512:
-  metadata.gz: ac2fdb41d5a0099d3cd031db5cedd9266c15327faee01f99a70b65f1cadd326e542697fbea0981d2f272b39b551e99f08594d62aac5248a876dc1c013f7cd9d9
-  data.tar.gz: be378516080dc415441b04ac96536a498831f7291c9ad06fe51b88e25ab385783a6cbd2445609a5458c41126c1ddae36ea33d47bd2a9acb9d1b2c18617e0b522
+  metadata.gz: 3e3beec21c5dd929985e4d7dd5c97b2bf921ca8a11d16b32e87fd5b54a9bd86859da41cf1d465a927031ed248d67daacdb4aa262ed22a9bc059a77352c9baab7
+  data.tar.gz: 9e94479cf5412fe688fdb82b196d541aeddfa6ddabd75398ffbbb0a84ef37ceda848bb5ebac4ced24f03a5e4f5e70e91727989b13d25b4f322db235efe02b454

data/CHANGELOG.md

@@ -1,96 +1,4 @@
-# 0.6.1
+# 0.0.4
 
-* Added configurable instance state check interval
-
-# 0.6.0 (December 13, 2014)
-
-* Support static Elastic IP addresses.
-* Support for creating AMIs with the `vagrant package`
-
-# 0.5.0 (June 22, 2014)
-
-* Support for associating public IPs for VMs inside of VPCs (GH
-  [#219](https://github.com/mitchellh/vagrant-aws/pull/219), GH
-  [#205](https://github.com/mitchellh/vagrant-aws/issues/205))
-* Bug-fix for per region configs with `associate_public_ip` (GH
-  [#237](https://github.com/mitchellh/vagrant-aws/pull/237))
-* rsyncing folders uses `--delete` flag to better emulate "real shared folders
-  (GH [#194](https://github.com/mitchellh/vagrant-aws/pull/194))
-* fog gem version bumped to 1.22 (GH [#253](https://github.com/mitchellh/vagrant-aws/pull/253))
-* Simple ELB support (GH [#88](https://github.com/mitchellh/vagrant-aws/pull/88),
-  GH [#238](https://github.com/mitchellh/vagrant-aws/pull/238))
-
-# 0.4.1 (December 17, 2013)
-
-* Update fog.io to 1.18.0
-* Fix sync folder user permissions (GH #175)
-* Fix vagrant < 1.3.0 provisioner compatibility (GH #173)
-* Add vagrant 1.4.0 multiple SSH key support (GH #172)
-* Fix EIP deallocation bug (GH #164)
-* Add (per shared folder) rsync exclude flag (GH #156)
-
-# 0.4.0 (October 11, 2013)
-
-* Handle EIP allocation error (GH #134)
-* Implement halt and reload (GH #31)
-* rsync ignores Vagrantfile
-* warn if none of the security groups allows incoming SSH
-* bump fog.io to 1.15.0
-* Fix rsync on windows (GH #77)
-* Add `ssh_host_attribute` config (GH #143)
-
-# 0.3.0 (September 2, 2013)
-
-* Parallelize multi-machine up on Vagrant 1.2+
-* Show proper configuration errors if an invalid configuration key
-  is used.
-* Request confirmation on `vagrant destroy`, like normal VirtualBox + Vagrant.
-* If user data is configured, output is shown on "vagrant up" that
-  it is being set.
-* Add EIP support (GH #65)
-* Add block device mapping support (GH #93)
-* README improvements (GH #120)
-* Fix missing locale message (GH #73)
-* SyncFolders creates hostpath if it doesn't exist and `:create` option is set (GH #17)
-* Add IAM Instance Profile support (GH #68)
-* Add shutdown behavior support (GH #125,#131)
-
-# 0.2.2 (April 18, 2013)
-
-* Fix crashing bug with incorrect provisioner arguments.
-
-# 0.2.1 (April 16, 2013)
-
-* Got rid of extranneous references to old SSH settings.
-
-# 0.2.0 (April 16, 2013)
-
-* Add support for `vagrant ssh -c` [GH-42]
-* Ability to specify a timeout for waiting for instances to become ready. [GH-44]
-* Better error message if instance didn't become ready in time.
-* Connection can now be done using IAM profiles. [GH-41]
-
-# 0.1.3 (April 9, 2013)
-
-* The `AWS_ACCESS_KEY` and `AWS_SECRET_KEY` will be used if available
-  and no specific keys are set in the Vagrantfile. [GH-33]
-* Fix issues with SSH on VPCs, the correct IP is used. [GH-30]
-* Exclude the ".vagrant" directory from rsync.
-* Implement `:disabled` flag support for shared folders. [GH-29]
-* `aws.user_data` to specify user data on the instance. [GH-26]
-
-# 0.1.2 (March 22, 2013)
-
-* Choose the proper region when connecting to AWS. [GH-9]
-* Configurable SSH port. [GH-13]
-* Support other AWS-compatible API endpoints with `config.endpoint`
-  and `config.version`. [GH-6]
-* Disable strict host key checking on rsync so known hosts aren't an issue. [GH-7]
-
-# 0.1.1 (March 18, 2013)
-
-* Up fog dependency for Vagrant 1.1.1
-
-# 0.1.0 (March 14, 2013)
-
-* Initial release.
+  * use nat-ted network provided by kvm
+  * remove hard-coded names

data/README.md

@@ -24,30 +24,4 @@ $ vagrant up --provider=g5k
 ```
 ## Configuration
 
-As an example we give this Vagrantfile:
-
-
-
-```ruby
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-
-Vagrant.configure(2) do |config|
-    # box isn't used
-    config.vm.box = "public/alpine_docker"
-    # user to log with inside the vm
-    config.ssh.username = "root"
-    # password to use to log inside the vm
-    config.ssh.password = ""
-
-    config.vm.provider "g5k" do |g5k|
-      g5k.username = "msimonin"
-      g5k.site = "lille"
-      g5k.image_location = "/home/msimonin/public/alpine_docker.qcow2"
-      g5k.image_type = "local"
-      g5k.image_strategy = "snapshot"
-    end
-
-end
-```
+Check the Vagrantfile.

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

@@ -0,0 +1,18 @@
+module VagrantPlugins
+  module G5K
+    module Action
+      class DeleteJob
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          job_id = env[:machine].id
+          conn = env[:g5k_connection]
+          conn.exec("oardel #{job_id}")
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-g5k/action.rb

@@ -62,16 +62,40 @@ module VagrantPlugins
         end
       end
 
+      # This action is called to terminate the remote machine.
+      def self.action_destroy
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use Call, DestroyConfirm do |env, b2|
+            if env[:result]
+              b2.use ConfigValidate
+              b2.use Call, IsCreated do |env2, b3|
+                if !env2[:result]
+                  b3.use MessageNotCreated
+                  next
+                end
+
+                b3.use ConnectG5K
+                b3.use DeleteJob
+              end
+            else
+              b2.use MessageWillNotDestroy
+            end
+          end
+        end
+      end
+
+
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
+      autoload :ConnectG5K, action_root.join("connect_g5k")
+      autoload :CreateLocalWorkingDir, action_root.join("create_local_working_dir")
+      autoload :DeleteJob, action_root.join("delete_job")
+      autoload :IsCreated, action_root.join("is_created")
       autoload :MessageAlreadyCreated, action_root.join("message_already_created")
       autoload :MessageNotCreated, action_root.join("message_not_created")
       autoload :ReadSSHInfo, action_root.join("read_ssh_info")
       autoload :ReadState, action_root.join("read_state")
-      autoload :ConnectG5K, action_root.join("connect_g5k")
-      autoload :CreateLocalWorkingDir, action_root.join("create_local_working_dir")
-      autoload :StartInstance, action_root.join("start_instance")
-      autoload :IsCreated, action_root.join("is_created")
       autoload :RunInstance, action_root.join("run_instance")
+      autoload :StartInstance, action_root.join("start_instance")
 
     end
   end

data/lib/vagrant-g5k/command.rb

@@ -11,10 +11,9 @@ module VagrantPlugins
       end
 
       def execute
-        conn = Connection.instance
-        # someday pretty print the output
-        puts conn.list_images
+        # TODO
       end
+
     end
   end
 end

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

@@ -73,7 +73,7 @@ module VagrantPlugins
       end
 
 
-      def check_job(job_id)
+     def check_job(job_id)
         oarstat = exec("oarstat --json")
         oarstat = JSON.load(oarstat)
         r = oarstat.select!{ |k,v| k == job_id and v["owner"] == @username }.values.first

data/lib/vagrant-g5k/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module G5K
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-g5k
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Matthieu Simonin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iniparse
@@ -129,8 +129,10 @@ files:
 - lib/vagrant-g5k.rb
 - lib/vagrant-g5k/.config.rb.swp
 - lib/vagrant-g5k/action.rb
+- lib/vagrant-g5k/action/.delete_job.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
 - lib/vagrant-g5k/action/is_created.rb
 - lib/vagrant-g5k/action/message_already_created.rb
 - lib/vagrant-g5k/action/message_not_created.rb
@@ -142,8 +144,6 @@ files:
 - lib/vagrant-g5k/errors.rb
 - lib/vagrant-g5k/plugin.rb
 - lib/vagrant-g5k/provider.rb
-- lib/vagrant-g5k/util/.g5k_utils.rb.swp
-- lib/vagrant-g5k/util/.launch_vm_fwd.sh.swp
 - lib/vagrant-g5k/util/g5k_utils.rb
 - lib/vagrant-g5k/util/launch_vm_fwd.sh
 - lib/vagrant-g5k/version.rb