lib/chef/knife/cloud/openstack_service.rb in knife-openstack-1.3.2 vs lib/chef/knife/cloud/openstack_service.rb in knife-openstack-2.0.0

- old
+ new

@@ -1,12 +1,13 @@ +# frozen_string_literal: true # # Author:: Siddheshwar More (<siddheshwar.more@clogeny.com>) # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>) # Copyright:: Copyright (c) 2013 Chef Software, Inc. # -require 'chef/knife/cloud/fog/service' +require "chef/knife/cloud/fog/service" class Chef class Knife class Cloud class OpenstackService < FogService @@ -33,11 +34,11 @@ 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 + raise CloudExceptions::ValidationError, error_message else servers.first end end rescue Excon::Errors::BadRequest => e @@ -45,21 +46,21 @@ end def get_auth_params load_fog_gem params = { - provider: 'OpenStack', + provider: "OpenStack", connection_options: { - ssl_verify_peer: !Chef::Config[:knife][:openstack_insecure] - } + ssl_verify_peer: !Chef::Config[:knife][:openstack_insecure], + }, } ( Fog::Compute::OpenStack.requirements + Fog::Compute::OpenStack.recognized - [:openstack_api_key] ).each do |k| - next unless k.to_s.start_with?('openstack') + 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