openstack_service.rb in knife-openstack-1.3.2.pre.1

- old
+ new
@@ -8,56 +8,52 @@
 
 class Chef
   class Knife
     class Cloud
       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_insecure #{Chef::Config[:knife][:openstack_insecure].to_s}")
-          Chef::Log.debug("openstack_region #{Chef::Config[:knife][:openstack_region].to_s}")
+          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 => {
-                                :provider => 'OpenStack',
-                                :openstack_username => Chef::Config[:knife][:openstack_username],
-                                :openstack_api_key => Chef::Config[:knife][:openstack_password],
-                                :openstack_auth_url => Chef::Config[:knife][:openstack_auth_url],
-                                :openstack_endpoint_type => Chef::Config[:knife][:openstack_endpoint_type],
-                                :openstack_tenant => Chef::Config[:knife][:openstack_tenant],
-                                :openstack_region => Chef::Config[:knife][:openstack_region],
-                                :connection_options => {
-                                  :ssl_verify_peer => !Chef::Config[:knife][:openstack_insecure]
+          super(options.merge(auth_params: {
+                                provider: 'OpenStack',
+                                openstack_username: Chef::Config[:knife][:openstack_username],
+                                openstack_api_key: Chef::Config[:knife][:openstack_password],
+                                openstack_auth_url: Chef::Config[:knife][:openstack_auth_url],
+                                openstack_endpoint_type: Chef::Config[:knife][:openstack_endpoint_type],
+                                openstack_tenant: Chef::Config[:knife][:openstack_tenant],
+                                openstack_region: Chef::Config[:knife][:openstack_region],
+                                connection_options: {
+                                  ssl_verify_peer: !Chef::Config[:knife][:openstack_insecure]
                                 }
-                }}))
+                              }))
         end
 
         # add alternate user defined api_endpoint value.
         def add_api_endpoint
-          @auth_params.merge!({:openstack_auth_url => Chef::Config[:knife][:api_endpoint]}) unless Chef::Config[:knife][:api_endpoint].nil?
+          @auth_params.merge!(openstack_auth_url: Chef::Config[:knife][:api_endpoint]) unless Chef::Config[:knife][:api_endpoint].nil?
         end
 
         def get_server(search_term)
-          begin
-            if server = connection.servers.get(search_term)
-              return server
-            end
+          if server = connection.servers.get(search_term)
+            return server
+          end
 
-            if servers = connection.servers.all(:name => search_term)
-              if servers.length > 1
-                error_message = "Multiple server matches found for '#{search_term}', use an instance_id to be more specific."
-                ui.fatal(error_message)
-                raise CloudExceptions::ValidationError, error_message
-              else
-                servers.first
-              end
+          if servers = connection.servers.all(name: search_term)
+            if servers.length > 1
+              error_message = "Multiple server matches found for '#{search_term}', use an instance_id to be more specific."
+              ui.fatal(error_message)
+              fail CloudExceptions::ValidationError, error_message
+            else
+              servers.first
             end
-          rescue Excon::Errors::BadRequest => e
-            handle_excon_exception(CloudExceptions::KnifeCloudError, e)
           end
+        rescue Excon::Errors::BadRequest => e
+          handle_excon_exception(CloudExceptions::KnifeCloudError, e)
         end
       end
     end
   end
 end