vagrant-g5k 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2356c0013be92069f4e7d3bc2987c175e20ff007
-  data.tar.gz: 2d94e08a93912a7fec591109cdee311614872cb9
+  metadata.gz: 86aa6692b587f6dafb5af922cd68f0093ef881dd
+  data.tar.gz: 34f959c39976c1a691fff4a56dea00936833f933
 SHA512:
-  metadata.gz: 3e3beec21c5dd929985e4d7dd5c97b2bf921ca8a11d16b32e87fd5b54a9bd86859da41cf1d465a927031ed248d67daacdb4aa262ed22a9bc059a77352c9baab7
-  data.tar.gz: 9e94479cf5412fe688fdb82b196d541aeddfa6ddabd75398ffbbb0a84ef37ceda848bb5ebac4ced24f03a5e4f5e70e91727989b13d25b4f322db235efe02b454
+  metadata.gz: e830af79549e92e5eeea46ac5f916614da5f289e4660e5a5889975b97c2ae1f506ee314434834ed8f0e3e35d51165d36072da3ffd88866ee3e6b660429342ff6
+  data.tar.gz: 20e48f9704439fbe1b60a20e88244c4e31cf190ae837fa5b9e293848f4b9ad2a185b94af2c4423662a7780bbfe2ced3086c8ca5b7a723e78070fd058ed411d44

data/README.md

@@ -1,6 +1,6 @@
 # Vagrant G5K Provider
 This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds an [G5K](https://www.grid5000.fr)
-provider to Vagrant, allowing Vagrant to control and provision machines in
+provider to Vagrant, allowing Vagrant to control and provision **virtual machines** in
 Grid5000.
 
 **NOTE:** This plugin requires Vagrant 1.2+,
@@ -25,3 +25,9 @@ $ vagrant up --provider=g5k
 ## Configuration
 
 Check the Vagrantfile.
+
+## Supported operations
+
+* `vagrant up`
+* `vagrant ssh`
+* `vagrant destroy`

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

@@ -12,16 +12,28 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:machine_ssh_info] = read_ssh_info(env[:g5k_connection], env[:machine])
+          ports = env[:machine].provider_config.ports
+          ssh_fwd = ports.select{ |x| x.split(':')[1] == '22'}.first
+          if ssh_fwd.nil?
+            env[:ui].error "SSH port 22 must be forwarded"
+            raise Error "SSh port 22 isn't forwarded"
+          end
+          ssh_fwd = ssh_fwd.split('-:')[0]
+          env[:machine_ssh_info] = read_ssh_info(env[:g5k_connection], env[:machine], ssh_fwd)
 
           @app.call(env)
         end
 
-        def read_ssh_info(conn, machine)
+        def read_ssh_info(conn, machine, ssh_fwd)
           return nil if machine.id.nil?
 
+          if ssh_fwd.nil? 
+
+            raise Error "ssh_port should be forwarded"
+          end
+
           return { :host          => conn.node,
-                   :port          => 2222,
+                   :port          => ssh_fwd,
                    :proxy_command => "ssh #{conn.username}@access.grid5000.fr nc %h %p",
 }
         end

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

@@ -141,8 +141,6 @@ module VagrantPlugins
       end
 
       def _generate_net()
-        # default port to use for ssh
-        @ports << "2222-:22"
         fwd_ports = @ports.map do |p|
           "hostfwd=tcp::#{p}"
         end.join(',')

data/lib/vagrant-g5k/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-g5k
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Matthieu Simonin
@@ -129,7 +129,8 @@ 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.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