openstack_service.rb in knife-openstack-2.1.7

- old
+ new

@@ -25,11 +25,11 @@
       class OpenstackService < FogService
         def initialize(options = {})
           Chef::Log.debug("openstack_username #{Chef::Config[:knife][:openstack_username]}")
           Chef::Log.debug("openstack_auth_url #{Chef::Config[:knife][:openstack_auth_url]}")
           Chef::Log.debug("openstack_tenant #{Chef::Config[:knife][:openstack_tenant]}")
-          Chef::Log.debug("openstack_endpoint_type #{Chef::Config[:knife][:openstack_endpoint_type] || 'publicURL'}")
+          Chef::Log.debug("openstack_endpoint_type #{Chef::Config[:knife][:openstack_endpoint_type] || "publicURL"}")
           Chef::Log.debug("openstack_insecure #{Chef::Config[:knife][:openstack_insecure]}")
           Chef::Log.debug("openstack_region #{Chef::Config[:knife][:openstack_region]}")
 
           super(options.merge(auth_params: get_auth_params))
         end
@@ -70,9 +70,10 @@
             Fog::Compute::OpenStack.requirements +
             Fog::Compute::OpenStack.recognized -
             [:openstack_api_key]
           ).each do |k|
             next unless k.to_s.start_with?("openstack")
+
             params[k] = Chef::Config[:knife][k]
           end
           params[:openstack_api_key] = Chef::Config[:knife][:openstack_password] || Chef::Config[:knife][:openstack_api_key]
 
           params