knife-vagrant2 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ee941f5425873c296f1813ea350eee29f1c1320
-  data.tar.gz: c7254238b04f65993b8fb7de035b0d581ff62c5d
+  metadata.gz: b31adf4a18a201fde7677235f3655c3378f5b59f
+  data.tar.gz: 10407edf414831de9ff1f154180843da97e3f318
 SHA512:
-  metadata.gz: 21875e807264aaeaaeebd2577c3ef99b2ff921b865be5e341dc988f2f7488d37a2bfb505b9d48807a6f6dd0baca3b0e79cf7b222a2a1bc7ccb966de9f8838d99
-  data.tar.gz: 4508b2332c2c063871df1b3ddd376b61883ef495f7ca311868d0680ce5ac233002513f2f3e8e06e31280f82fd4a331a6402e4041f1ba97b5ea783bc84c517c8c
+  metadata.gz: 9799ac9ba92cba75333505371e098f025d23cd3c23fca728bcec22fe34365c1e931c4690225a3162ef4fc6df165b4069e495aa883c2ea260c8907479c8e543b9
+  data.tar.gz: 52fd676f4a6a913d554b58bb12da2060eb6daef91f9d170f4ed2a26cfb8b556749e5eff0086fb88de96be436a8c1456492335090096d38876d4cd3c47c39e1ac

data/.gitignore

@@ -7,3 +7,4 @@ Icon?
 *.gem
 Gemfile.lock
 
+.idea

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 0.0.6 (2014-12-30)
+
+## Changes and new features
+
+* Support for the new, random SSH keys in Vagrant 1.7
+
+
+## Fixes
+
+* Make --vmx-customize option actually work
+
+
 # 0.0.5 (2014-12-11)
 
 ## Changes and new features
@@ -49,3 +61,4 @@
 * [Robert J. Berger](https://github.com/rberger)
 * [xsunsmile](https://github.com/xsunsmile)
 * [Mevan Samaratunga](https://github.com/mevansam)
+* [Joshua Kruck](https://github.com/krujos)

data/lib/chef/knife/vagrant_base.rb

@@ -93,6 +93,17 @@ class Chef
         @vagrant_instances
       end
 
+      def vagrant_version
+        @vagrant_version ||= begin
+          version = vagrant_exec('', '-v', { :no_cwd_change => true, :fetch_output => true })
+          version = /Vagrant\s+([0-9\.]+)/.match(version) { |m| m[1] }
+        end
+      end
+
+      def vagrant_version_cmp(version)
+        Gem::Version.new(vagrant_version) <=> Gem::Version.new(version)
+      end
+
       def write_insecure_key
         # The private key most vagrant boxes use.
         insecure_key = <<-EOF

data/lib/chef/knife/vagrant_server_create.rb

@@ -1,4 +1,5 @@
 require 'chef/knife/vagrant_base'
+require 'find'
 
 class Chef
   class Knife
@@ -191,7 +192,6 @@ class Chef
         cmd = "up --provider #{locate_config_value(:provider)}"
         vagrant_exec(@server.name, cmd)
 
-        write_insecure_key
         print "\n#{ui.color("Waiting for sshd", :magenta)}"
         wait_for_sshd(@server.ip_address)
 
@@ -217,7 +217,7 @@ class Chef
       end
 
       def build_vmx_customize(customize)
-        customize.split(/::/).collect { |k| "v.vmx [ #{k} ]" }.join("\n") if customize
+        customize.split(/::/).collect { |k| "v.vmx[#{k.split('=')[0]}] = #{k.split('=')[1]}" }.join("\n") if customize
       end
 
       def build_shares(share_folders)
@@ -235,6 +235,9 @@ class Chef
         if @server.vagrant_config
           additions << @server.vagrant_config.split(/::/)
         end
+        unless config[:identity_file].nil?
+          additions << 'config.ssh.private_key_path = "' + config[:identity_file] + '"'
+        end
 
         file = <<-EOF
 Vagrant.configure("2") do |config|
@@ -281,8 +284,27 @@ end
         bootstrap.config[:ssh_user] = config[:ssh_user]
         bootstrap.config[:ssh_port] = config[:ssh_port]
         bootstrap.config[:ssh_gateway] = config[:ssh_gateway]
-        bootstrap.config[:identity_file] = config[:identity_file] || File.join(locate_config_value(:vagrant_dir), 'insecure_key')
         bootstrap.config[:chef_node_name] = locate_config_value(:chef_node_name) || server.ip
+
+        # Starting from version 1.7 Vagrant replaces the fixed insecure key with a new,
+        # random one the first time it is brought up. If that's the case we need to use
+        # it to bootstrap.
+        msg_pair("Vagrant version", vagrant_version)
+        if config[:identity_file]
+          bootstrap.config[:identity_file] = config[:identity_file]
+        elsif vagrant_version_cmp('1.7') < 0
+          write_insecure_key
+          bootstrap.config[:identity_file] = File.join(locate_config_value(:vagrant_dir), 'insecure_key')
+        else
+          # Vagrant puts the private key under the provider (i.e. 'virtualbox') so we search for it
+          path = File.join(locate_config_value(:vagrant_dir), server.name, '.vagrant/')
+          Find.find(path) do |f|
+            if File.basename(f) == 'private_key'
+              bootstrap.config[:identity_file] = f
+            end
+          end
+        end
+
         bootstrap.config[:distro] = locate_config_value(:distro) || "chef-full"
         bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
         bootstrap.config[:host_key_verify] = config[:host_key_verify]

data/lib/knife-vagrant/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Vagrant
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vagrant2
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Markus Kern
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef