kitchen-openstack 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d61046f3b469a583ba70e208458891c7776d2e84
-  data.tar.gz: 39dd8f696144547472cf9e36add6d30c1272d57c
+  metadata.gz: bd777017fb7da7ae301b48183ac23a1a1b2b7e48
+  data.tar.gz: 599ddad461ccb284570401d3f5561874c15ac2be
 SHA512:
-  metadata.gz: 90b0fd6ce3270b2ca24c3aab4a69a64a2ddcf2cacf6ce54e0efab379cb725077df0ed7881ed839714f411e8f19bdd054bef4aacda34df8e6f46711b630161aa1
-  data.tar.gz: 9252addff3911915eb6447881089541b1eef64ce5cbc5e173ae10d29fe50f2fdbcbd06d1dec6202ce44c8754572b02ec92fe792f118ea132e02a5c958a8d4bda
+  metadata.gz: f1d10cb0dc35c7c85bfa03942d0e2b0b84713e0655889c0ad41419d6cb1b84f31a104d3eb4dbfb769875bf0c601dd26828688b9f178bc390d2d836e3939bc7d7
+  data.tar.gz: 7dba80c14cbc214df24fec6043465a1bd53f171580e5031d814b43d18c452643ac1636f61836ee724ca0aefcf3d94e6c89ddda6461307b782834f0eb066a4c16

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.5.0 / 2014-05-22
+
+### New Features
+
+* PR [#48][] - Enable the Ohai OpenStack plugin; via [@dschlenk][]
+
 # 1.4.0 / 2014-04-09
 
 ### Improvements
@@ -87,6 +93,7 @@ certain specified NICs; via [@monsterzz][]
 
 * Initial release! Woo!
 
+[#48]: https://github.com/test-kitchen/kitchen-openstack/pull/48
 [#46]: https://github.com/test-kitchen/kitchen-openstack/pull/46
 [#41]: https://github.com/test-kitchen/kitchen-openstack/pull/41
 [#40]: https://github.com/test-kitchen/kitchen-openstack/pull/40

data/kitchen-openstack.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'fog', '~> 1.18'
   # Newer Fogs throw a warning if unf isn't there :(
   spec.add_dependency 'unf'
+  spec.add_dependency 'ohai'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/kitchen/driver/openstack.rb

@@ -22,6 +22,7 @@ require 'kitchen'
 require 'etc'
 require 'ipaddr'
 require 'socket'
+require 'ohai'
 
 module Kitchen
   module Driver
@@ -75,6 +76,7 @@ module Kitchen
         end
         info "Using public SSH key <#{config[:public_key_path]}>"
         info "Using private SSH key <#{config[:private_key_path]}>"
+        add_ohai_hint(state, config, server)
         unless config[:key_name]
           do_ssh_setup(state, config, server)
         end
@@ -260,6 +262,15 @@ module Kitchen
         return pub, priv
       end
 
+      def add_ohai_hint(state, config, server)
+        info 'Adding OpenStack hint for ohai'
+        ssh = Fog::SSH.new(*build_ssh_args(state))
+        ssh.run([
+          %{sudo mkdir -p #{Ohai::Config[:hints_path][0]}},
+          %{sudo touch #{Ohai::Config[:hints_path][0]}/openstack.json}
+        ])
+      end
+
       def do_ssh_setup(state, config, server)
         info "Setting up SSH access for key <#{config[:public_key_path]}>"
         ssh = Fog::SSH.new(state[:hostname], config[:username],

data/lib/kitchen/driver/openstack_version.rb

@@ -19,7 +19,7 @@
 module Kitchen
   module Driver
     # Version string for OpenStack Kitchen driver
-    OPENSTACK_VERSION = '1.4.0'
+    OPENSTACK_VERSION = '1.5.0'
   end
 end
 

data/spec/kitchen/driver/openstack_spec.rb

@@ -22,6 +22,7 @@ require 'logger'
 require 'stringio'
 require 'rspec'
 require 'kitchen'
+require 'ohai'
 
 describe Kitchen::Driver::Openstack do
   let(:logged_output) { StringIO.new }
@@ -157,6 +158,7 @@ describe Kitchen::Driver::Openstack do
         'root',
         { :port => '22' }).and_return(true)
       d.stub(:get_ip).and_return('1.2.3.4')
+      d.stub(:add_ohai_hint).and_return(true)
       d.stub(:do_ssh_setup).and_return(true)
       d
     end
@@ -889,6 +891,27 @@ describe Kitchen::Driver::Openstack do
     end
   end
 
+  describe '#add_ohai_hint' do
+    let(:config) { { :public_key_path => '/pub_key' } }
+    let(:server) { double(:password => 'aloha') }
+    let(:state) { { :hostname => 'host' } }
+    let(:ssh) do
+      s = double('ssh')
+      s.stub(:run) { |args| args }
+      s
+    end
+    it 'opens an SSH session to the server' do
+      Fog::SSH.stub(:new).with('host', 'root',
+        anything()).and_return(ssh)
+      res = driver.send(:add_ohai_hint, state, config, server)
+      expected = [
+        "sudo mkdir -p #{Ohai::Config[:hints_path][0]}",
+        "sudo touch #{Ohai::Config[:hints_path][0]}/openstack.json"
+      ]
+      expect(res).to eq(expected)
+    end
+  end
+
   describe '#disable_ssl_validation' do
     it 'turns off Excon SSL cert validation' do
       expect(driver.send(:disable_ssl_validation)).to eq(false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ohai
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement