kitchen-openstack 2.0.0.dev.2 → 2.0.0.dev.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cef0991824a20e3a44ecfe230dfe3e5ef9057e7d
-  data.tar.gz: 70dd8e1b27f23ce8d1a576cdae41ffcedc0cadb5
+  metadata.gz: 66008f6399b2f88b79228a8e4bdcb0d4d66e1e23
+  data.tar.gz: 025e776aeb603cf6e5c461eec6af7ba9517f2f35
 SHA512:
-  metadata.gz: eea8bd9d0d91d0b996e2fa382b983beff57fadd1de33bec438786e3fa9efa98c3ee38f3cae4f3a9836958f44ade3c91a6767d5e6bba2f1407d01e9a840423b5a
-  data.tar.gz: c070913b199da7bff57171cc9f8245a956038734a825e491f8e4191576bc07d728adc25abc37d3eef3c74bc9d6811be9df0d0ca05be48408363b5d4376803da9
+  metadata.gz: 6f8887259c413711e78cac4bb47c364c4d234601a30b76c93a18dd1961904fee17748f61ef9e9a70a3248405372e4ac0e266f5310c85b41c793f12b2ee7792d6
+  data.tar.gz: 2b861ee3fb1d09f3e74e5b38e57b284277a300fb752c5456aba843225da1f55b9e0f85907080f5e1eae7f1090111600a148c1f892f9b8d5aec00656236b4681b

data/CHANGELOG.md

@@ -5,6 +5,10 @@
 * Re-written for the new test-kitchen underlying framework
 * Windows and WinRM support
 * Stole some code from PR [#80][] - from [@jmahowald][]
+* Resolve for issue [#96][]
+* Don't create instance if name is already created [#100][] - from [@dpetzel][]
+* Load openstack_version for plugin_version [#99][] - from [@BobbyRyterski][]
+* Support all Fog OpenStack options [#98][] - from [@BobbyRyterski][]
 
 # 1.8.1 / 2015-07-22
 

data/README.md

@@ -55,6 +55,9 @@ driver:
 The `image_ref` and `flavor_ref` options can be specified as an exact id,
 an exact name, or as a regular expression matching the name of the image or flavor.
 
+All of Fog's `openstack` options (`openstack_domain_name`, `openstack_project_name`,
+...) are supported. This includes support for the OpenStack Identity v3 API.
+
 Test Kitchen 1.4 supports multiple transports, and transports can be configure globally:
 
 ```yaml

data/lib/kitchen/driver/openstack.rb

@@ -73,15 +73,24 @@ module Kitchen
         end
       end
 
+      # Set the proper server name in the config
+      def config_server_name
+        return if config[:server_name]
+
+        if config[:server_name_prefix]
+          config[:server_name] = server_name_prefix(
+            config[:server_name_prefix]
+          )
+        else
+          config[:server_name] = default_name
+        end
+      end
+
       def create(state)
-        unless config[:server_name]
-          if config[:server_name_prefix]
-            config[:server_name] = server_name_prefix(
-              config[:server_name_prefix]
-            )
-          else
-            config[:server_name] = default_name
-          end
+        config_server_name
+        if state[:server_id]
+          info "#{config[:server_name]} (#{state[:server_id]}) already exists."
+          return
         end
         disable_ssl_validation if config[:disable_ssl_validation]
         server = create_server
@@ -118,7 +127,7 @@ module Kitchen
           provider: 'OpenStack'
         }
         required_server_settings.each { |s| server_def[s] = config[s] }
-        optional_server_settings.each { |s| server_def[s] = config[s] }
+        optional_server_settings.each { |s| server_def[s] = config[s] if config[s] } # rubocop:disable Metrics/LineLength
         server_def
       end
 
@@ -127,7 +136,9 @@ module Kitchen
       end
 
       def optional_server_settings
-        [:openstack_tenant, :openstack_region, :openstack_service_name]
+        Fog::Compute::OpenStack.recognized.select do |k|
+          k.to_s.start_with?('openstack')
+        end - required_server_settings
       end
 
       def network
@@ -323,14 +334,14 @@ module Kitchen
         if bourne_shell?
           info 'Adding OpenStack hint for ohai'
           mkdir_cmd = "sudo mkdir -p #{hints_path}"
-          touch_cmd = "sudo touch #{hints_path}/openstack.json"
+          touch_cmd = "sudo cat '{}' >> #{hints_path}/openstack.json"
           instance.transport.connection(state).execute(
             "#{mkdir_cmd} && #{touch_cmd}"
           )
         elsif windows_os?
           info 'Adding OpenStack hint for ohai'
           mkdir_cmd = "mkdir #{hints_path}"
-          touch_cmd = "'' > #{hints_path}\\openstack.json"
+          touch_cmd = "'{}' > #{hints_path}\\openstack.json"
           instance.transport.connection(state).execute(
             "#{mkdir_cmd} && #{touch_cmd}"
           )

data/lib/kitchen/driver/openstack_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    OPENSTACK_VERSION = '2.0.0.dev.2'
+    OPENSTACK_VERSION = '2.0.0.dev.3'
   end
 end

data/spec/kitchen/driver/openstack_spec.rb

@@ -232,6 +232,14 @@ describe Kitchen::Driver::Openstack do
         driver.create(state)
       end
     end
+
+    context 'when a server is already created' do
+      it 'does not create a new instance' do
+        state[:server_id] = '123'
+        expect(driver).not_to receive(:create_server)
+        driver.create(state)
+      end
+    end
   end
 
   describe '#destroy' do
@@ -330,10 +338,10 @@ describe Kitchen::Driver::Openstack do
 
   describe '#optional_server_settings' do
     it 'returns the optional settings for an OpenStack server' do
-      expected = [
-        :openstack_tenant, :openstack_region, :openstack_service_name
+      excluded = [
+        :openstack_username, :openstack_api_key, :openstack_auth_url
       ]
-      expect(driver.send(:optional_server_settings)).to eq(expected)
+      expect(driver.send(:optional_server_settings)).not_to include(*excluded)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 2.0.0.dev.2
+  version: 2.0.0.dev.3
 platform: ruby
 authors:
 - Jonathan Hartman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen