kitchen-openstack 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45ebfdb6c5d4785de57b8953b0e361869739ae718a40c7d4e9723113d22c7a59
-  data.tar.gz: bab7ff030a9787f2e52ddccec8d1ef4d7c73859958d13e232f8429020d5b3f4d
+  metadata.gz: ed10521f2bd0acc22db46ff87e0279f2d919fbd66ed6a6088e4825d8a75c5d84
+  data.tar.gz: a0875746a6229f500b4c4e68e68f875527b1b5c90e0ab2616d79dc4035c2147f
 SHA512:
-  metadata.gz: 21d13af2b2062a8a5b547ffd4fdf61f076f7f6178c0038f70359e42737295553b456df211a68e7c6b631df82de94399d414329ab651127b391c28f914b071efc
-  data.tar.gz: 93dcedbec3563c85e9f8fd274378091570cd4338ee053b1da7fa366bc66feca1f42d507488c86403d937f741d1cfb354c67345b7571a2801046e8150529032df
+  metadata.gz: d46edbaac847718f7e3a9559c6003f91703bc5fd67c5d4609eab25dc6a0e0e54b495da0293a0f97746862fc0f04ccec675bdc118c2d89973910925b43ad1d81d
+  data.tar.gz: c4702f11e45567513496170e0283802929c5b7802186e6d3c14b80819130b1579231a59b263b4c3bfd3197cc5c5c6716c3dde032494d5e764626c05a279f6296

data/lib/kitchen/driver/openstack.rb

@@ -133,7 +133,6 @@ module Kitchen
 
       def openstack_server
         server_def = {
-          provider: "OpenStack",
           connection_options: {},
         }
         required_server_settings.each { |s| server_def[s] = config[s] }
@@ -157,7 +156,7 @@ module Kitchen
       end
 
       def network
-        Fog::Network.new(openstack_server)
+        Fog::OpenStack::Network.new(openstack_server)
       end
 
       def compute
@@ -174,7 +173,7 @@ module Kitchen
 
       def create_server
         server_def = init_configuration
-        fail(ActionFailed, "Cannot specify both network_ref and network_id") if config[:network_id] && config[:network_ref] # rubocop:disable Style/SignalException
+        raise(ActionFailed, "Cannot specify both network_ref and network_id") if config[:network_id] && config[:network_ref]
 
         if config[:network_id]
           networks = [].concat([config[:network_id]])
@@ -209,8 +208,8 @@ module Kitchen
       end
 
       def init_configuration
-        fail(ActionFailed, "Cannot specify both image_ref and image_id") if config[:image_id] && config[:image_ref] # rubocop:disable Style/SignalException
-        fail(ActionFailed, "Cannot specify both flavor_ref and flavor_id") if config[:flavor_id] && config[:flavor_ref] # rubocop:disable Style/SignalException
+        raise(ActionFailed, "Cannot specify both image_ref and image_id") if config[:image_id] && config[:image_ref]
+        raise(ActionFailed, "Cannot specify both flavor_ref and flavor_id") if config[:flavor_id] && config[:flavor_ref]
 
         {
           name: config[:server_name],
@@ -233,7 +232,7 @@ module Kitchen
 
       def find_image(image_ref)
         image = find_matching(compute.images, image_ref)
-        fail(ActionFailed, "Image not found") unless image # rubocop:disable Style/SignalException
+        raise(ActionFailed, "Image not found") unless image
 
         debug "Selected image: #{image.id} #{image.name}"
         image
@@ -241,7 +240,7 @@ module Kitchen
 
       def find_flavor(flavor_ref)
         flavor = find_matching(compute.flavors, flavor_ref)
-        fail(ActionFailed, "Flavor not found") unless flavor # rubocop:disable Style/SignalException
+        raise(ActionFailed, "Flavor not found") unless flavor
 
         debug "Selected flavor: #{flavor.id} #{flavor.name}"
         flavor
@@ -249,7 +248,7 @@ module Kitchen
 
       def find_network(network_ref)
         net = find_matching(network.networks.all, network_ref)
-        fail(ActionFailed, "Network not found") unless net # rubocop:disable Style/SignalException
+        raise(ActionFailed, "Network not found") unless net
 
         debug "Selected net: #{net.id} #{net.name}"
         net
@@ -315,7 +314,7 @@ module Kitchen
               i.ip if i.fixed_ip.nil? && i.instance_id.nil? && i.pool == pool
             end.compact
             if free_addrs.empty?
-              fail ActionFailed, "No available IPs in pool <#{pool}>" # rubocop:disable Style/SignalException
+              raise ActionFailed, "No available IPs in pool <#{pool}>"
             end
 
             config[:floating_ip] = free_addrs[0]
@@ -368,7 +367,7 @@ module Kitchen
         pub, priv = parse_ips(pub, priv)
         pub[config[:public_ip_order].to_i] ||
           priv[config[:private_ip_order].to_i] ||
-          fail(ActionFailed, "Could not find an IP") # rubocop:disable Style/SignalException
+          raise(ActionFailed, "Could not find an IP")
       end
 
       def filter_ips(addresses)

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

@@ -36,7 +36,7 @@ module Kitchen
         end
 
         def volume(openstack_server)
-          Fog::Volume.new(openstack_server)
+          Fog::OpenStack::Volume.new(openstack_server)
         end
 
         def create_volume(config, os)

data/lib/kitchen/driver/openstack_version.rb

@@ -24,6 +24,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    OPENSTACK_VERSION = "5.0.0"
+    OPENSTACK_VERSION = "5.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Jonathan Hartman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -45,20 +45,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: unf
-  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: ohai
   requirement: !ruby/object:Gem::Requirement
@@ -115,20 +101,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cane
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
@@ -157,48 +129,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-console
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement