kitchen-openstack 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84ee970244371b0d525d62e3de2683562249fc49
-  data.tar.gz: 9fbd1af6fc48fa29385f04c851d92e3ac91aabf0
+  metadata.gz: 7b433d2d0a11684712ba845ba47b696cd2c6fde9
+  data.tar.gz: e59925c69ddc2d248af40de6d816ab61f3221364
 SHA512:
-  metadata.gz: 480bf5ffa70f5eab36da5c14d4b32a9ae2c841c893af0cda92268bfe193ba35dfc841e12f647791e8da1b88c17484ce806d66b8a9046d17a70ffedf30ce9bd44
-  data.tar.gz: bc296c784c1c1fe36394cd7de4ca636a6f00c350530e677039725133096c9b764d7e45a8fd0cccf3fc3d7a05266f866a0de72def187d5ed797fecf82ef4386be
+  metadata.gz: 64d46e0d70d2b65f9e555fb468c31b89ceeff651463204f6f0907686455124da4fdd52a157ba2b9b5379890e9c5c810f0bc6344c7696341ace61e38173ddf87e
+  data.tar.gz: 93ac9c600b157277deef7a491f5ec00ebc18cb089b7b638f29692f00f0ec79fa963652f41fedc4da419e9d62a88a3e3705e8fbe2ebe5c50070de11405a551bdc

data/CHANGELOG.md

@@ -1,7 +1,15 @@
 # Change Log
 
-## [Unreleased](https://github.com/test-kitchen/kitchen-openstack/tree/v3.4.0)
+## [v3.5.0](https://github.com/test-kitchen/kitchen-openstack/tree/v3.5.0)
 
+[Full Changelog](https://github.com/test-kitchen/kitchen-openstack/compare/v3.4.0...v3.5.0)
+
+**Merged pull requests:**
+
+- Add metadata support [\#166](https://github.com/test-kitchen/kitchen-openstack/pull/166) ([akitada](https://github.com/akitada))
+- Use new ohai config context [\#165](https://github.com/test-kitchen/kitchen-openstack/pull/165) ([akitada](https://github.com/akitada))
+
+## [v3.4.0](https://github.com/test-kitchen/kitchen-openstack/tree/v3.4.0) (2017-03-27)
 [Full Changelog](https://github.com/test-kitchen/kitchen-openstack/compare/v3.3.0...v3.4.0)
 
 **Closed issues:**

data/Rakefile

@@ -15,4 +15,4 @@ end
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: [:rubocop, :loc, :spec]
+task default: %i(rubocop loc spec)

data/lib/kitchen/driver/openstack.rb

@@ -1,4 +1,5 @@
 # Encoding: UTF-8
+
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
 # Author:: JJ Asghar (<jj@chef.io>)
@@ -59,6 +60,7 @@ module Kitchen
       default_config :connect_timeout, 60
       default_config :read_timeout, 60
       default_config :write_timeout, 60
+      default_config :metadata, nil
 
       # Set the proper server name in the config
       def config_server_name
@@ -142,7 +144,7 @@ module Kitchen
       end
 
       def required_server_settings
-        [:openstack_username, :openstack_api_key, :openstack_auth_url]
+        %i(openstack_username openstack_api_key openstack_auth_url)
       end
 
       def optional_server_settings
@@ -152,7 +154,7 @@ module Kitchen
       end
 
       def connection_options
-        [:read_timeout, :write_timeout, :connect_timeout]
+        %i(read_timeout write_timeout connect_timeout)
       end
 
       def network
@@ -190,12 +192,13 @@ module Kitchen
           server_def[:block_device_mapping] = get_bdm(config)
         end
 
-        [
-          :security_groups,
-          :key_name,
-          :user_data,
-          :config_drive
-        ].each do |c|
+        %i(
+          security_groups
+          key_name
+          user_data
+          config_drive
+          metadata
+        ).each do |c|
           server_def[c] = optional_config(c) if config[c]
         end
 
@@ -401,7 +404,7 @@ module Kitchen
       end
 
       def hints_path
-        Ohai::Config[:hints_path][0]
+        Ohai.config[:hints_path][0]
       end
 
       def disable_ssl_validation

data/lib/kitchen/driver/openstack/volume.rb

@@ -1,4 +1,5 @@
 # Encoding: UTF-8
+
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
 #
@@ -40,8 +41,8 @@ module Kitchen
         def create_volume(config, os)
           opt = {}
           bdm = config[:block_device_mapping]
-          vanilla_options = [:snapshot_id, :imageRef, :volume_type,
-                             :source_volid, :availability_zone]
+          vanilla_options = %i(snapshot_id imageRef volume_type
+                               source_volid availability_zone)
           vanilla_options.select { |o| bdm[o] }.each do |key|
             opt[key] = bdm[key]
           end

data/lib/kitchen/driver/openstack_version.rb

@@ -1,4 +1,5 @@
 # Encoding: UTF-8
+
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
 #
@@ -22,6 +23,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    OPENSTACK_VERSION = '3.4.0'.freeze
+    OPENSTACK_VERSION = '3.5.0'.freeze
   end
 end

data/spec/kitchen/driver/openstack_spec.rb

@@ -18,8 +18,8 @@ require 'fog'
 describe Kitchen::Driver::Openstack do
   let(:logged_output) { StringIO.new }
   let(:logger) { Logger.new(logged_output) }
-  let(:config) { Hash.new }
-  let(:state) { Hash.new }
+  let(:config) { {} }
+  let(:state) { {} }
   let(:instance_name) { 'potatoes' }
   let(:transport)     { Kitchen::Transport::Dummy.new }
   let(:platform)      { Kitchen::Platform.new(name: 'fake_platform') }
@@ -69,17 +69,18 @@ describe Kitchen::Driver::Openstack do
         expect(driver[:connect_timeout]).to eq(60)
       end
 
-      nils = [
-        :server_name,
-        :openstack_tenant,
-        :openstack_region,
-        :openstack_service_name,
-        :floating_ip_pool,
-        :floating_ip,
-        :availability_zone,
-        :security_groups,
-        :network_ref
-      ]
+      nils = %i(
+        server_name
+        openstack_tenant
+        openstack_region
+        openstack_service_name
+        floating_ip_pool
+        floating_ip
+        availability_zone
+        security_groups
+        network_ref
+        metadata
+      )
       nils.each do |i|
         it "defaults to no #{i}" do
           expect(driver[i]).to eq(nil)
@@ -117,6 +118,10 @@ describe Kitchen::Driver::Openstack do
             volume_size: '5',
             device_name: 'vda',
             delete_on_termination: true
+          },
+          metadata: {
+            name: 'test',
+            ohai: 'chef'
           }
         }
       end
@@ -232,7 +237,7 @@ describe Kitchen::Driver::Openstack do
     end
 
     context 'no server ID present' do
-      let(:state) { Hash.new }
+      let(:state) { {} }
 
       it 'does nothing' do
         allow(driver).to receive(:compute)
@@ -330,18 +335,18 @@ describe Kitchen::Driver::Openstack do
 
   describe '#required_server_settings' do
     it 'returns the required settings for an OpenStack server' do
-      expected = [
-        :openstack_username, :openstack_api_key, :openstack_auth_url
-      ]
+      expected = %i(
+        openstack_username openstack_api_key openstack_auth_url
+      )
       expect(driver.send(:required_server_settings)).to eq(expected)
     end
   end
 
   describe '#optional_server_settings' do
     it 'returns the optional settings for an OpenStack server' do
-      excluded = [
-        :openstack_username, :openstack_api_key, :openstack_auth_url
-      ]
+      excluded = %i(
+        openstack_username openstack_api_key openstack_auth_url
+      )
       expect(driver.send(:optional_server_settings)).not_to include(*excluded)
     end
   end
@@ -814,6 +819,37 @@ describe Kitchen::Driver::Openstack do
         driver.send(:create_server)
       end
     end
+
+    context 'metadata specified' do
+      let(:config) do
+        {
+          server_name: 'hello',
+          image_ref: '111',
+          flavor_ref: '1',
+          metadata: {
+            name: 'hello',
+            ohai: 'chef'
+          }
+        }
+      end
+      let(:data) do
+        {
+          name: 'hello',
+          ohai: 'chef'
+        }
+      end
+
+      it 'passes metadata contents' do
+        expect(servers).to receive(:create).with(
+          name: 'hello',
+          image_ref: '111',
+          flavor_ref: '1',
+          availability_zone: nil,
+          metadata: data
+        )
+        driver.send(:create_server)
+      end
+    end
   end
 
   describe '#default_name' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Jonathan Hartman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen