vagrant-g5k 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d881ded22e0ffd6c634d6404ee9b0b6d2216cc6b
-  data.tar.gz: 7191c5867fce7ff80f0216b10f5129891fc31bab
+  metadata.gz: 043f3958657451cc6b632023f0d8af571b172a61
+  data.tar.gz: 80ef66e4918d63bfefb0f27878c9d5ce4348fb5d
 SHA512:
-  metadata.gz: 25932a96059c4e8afe177439e258b55a933a188c08975b96f7eee3d2b0290f0ebb316ab4bd5e40ba53b4c31dde8d46e798c070ada62667cd4841e5b6e7242832
-  data.tar.gz: 2700541904729a15a3e2344ec26ec4f4ca82a6212e34635cf18d749cc40510e82a10b362af0210b45a2cff65d6eaabdf0d363f0a255302e5619b2c6dc11a029f
+  metadata.gz: cb8a65146f1752975ddb92363f47c1af6f63d6893b2a041c6aab2a700eeccf5937f4fb0ae751115fe8d3c3b8aec282d1cf4fbb689144987e429e978427b55fee
+  data.tar.gz: d724bd697b85cc1d674ba8a2ab744a29af278ffc08fcb2c70742dac5144cfb457d5a4425cbf8c7031364150a5c1fd8a03e98913e08aac03c3011d5566adc6f66

data/.gitignore

@@ -13,7 +13,6 @@ Gemfile.lock
 
 # Vagrant
 .vagrant
-Vagrantfile
 !example_box/Vagrantfile
 
 # RVM files for gemset/ruby setting

data/Vagrantfile

@@ -0,0 +1,38 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Testing purpose only
+Vagrant.require_plugin "vagrant-g5k"
+
+Vagrant.configure(2) do |config|
+    # box isn't used
+    config.vm.define "vm" do |my|
+      my.vm.box = "dummy"
+    end
+
+    # 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|
+      # 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"
+      # 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"
+      # ports to expose (at least ssh has to be forwarded)
+      g5k.ports = ['2222-:22']
+    end
+
+
+     
+end
+
+

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

@@ -17,6 +17,7 @@ module VagrantPlugins
           env[:g5k_connection] = Connection.new(
              :logger => env[:ui],
              :username => env[:machine].provider_config.username,
+             :private_key => env[:machine].provider_config.private_key,
              :image_location => env[:machine].provider_config.image_location, 
              :site => env[:machine].provider_config.site,
              :ports => env[:machine].provider_config.ports,

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

@@ -24,6 +24,15 @@ module VagrantPlugins
           @app.call(env)
         end
 
+        def ssh_key(conn)
+          if conn.private_key.nil?
+            ""
+          else
+             "-i #{conn.private_key}"
+          end
+        end
+
+
         def read_ssh_info(conn, machine, ssh_fwd)
           return nil if machine.id.nil?
 
@@ -31,11 +40,13 @@ module VagrantPlugins
 
             raise Error "ssh_port should be forwarded"
           end
-
-          return { :host          => conn.node,
+          ssh_info = {
+                   :host          => conn.node,
                    :port          => ssh_fwd,
-                   :proxy_command => "ssh #{conn.username}@access.grid5000.fr nc %h %p",
-}
+                   :proxy_command => "ssh #{conn.username}@access.grid5000.fr #{ssh_key(conn)} nc %h %p",
+          }
+          ssh_info[:private_key_path] = [conn.private_key] if ! conn.private_key.nil?
+          return ssh_info
         end
       end
     end

data/lib/vagrant-g5k/config.rb

@@ -9,6 +9,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :username
 
+      # G5K private_key
+      #
+      # @return [String]
+      attr_accessor :private_key
+
       # G5K site
       #
       # @return [String]

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

@@ -18,6 +18,8 @@ module VagrantPlugins
 
       attr_accessor :username
 
+      attr_accessor :private_key
+
       attr_accessor :site
 
       attr_accessor :image_location
@@ -46,9 +48,13 @@ module VagrantPlugins
           instance_variable_set("@#{k}", v) unless v.nil?
         end
         @logger.info("connecting with #{@username} on site #{@site}")
-        gateway = Net::SSH::Gateway.new("access.grid5000.fr", @username, :forward_agent => true)
+        options = {
+          :forward_agent => true
+        }
+        options[:keys] = [@private_key] if !@private_key.nil?
+        gateway = Net::SSH::Gateway.new("access.grid5000.fr", @username, options)
 
-        @session = gateway.ssh(@site, @username)
+        @session = gateway.ssh(@site, @username, options)
       end
 
       def list_images()

data/lib/vagrant-g5k/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-g5k
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Matthieu Simonin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iniparse
@@ -126,6 +126,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- Vagrantfile
 - lib/vagrant-g5k.rb
 - lib/vagrant-g5k/.config.rb.swp
 - lib/vagrant-g5k/action.rb