knife-openstack 2.1.0 → 4.0.5

data/lib/chef/knife/openstack_floating_ip_disassociate.rb

@@ -1,10 +1,24 @@
-# frozen_string_literal: true
+#
 # Author:: Vasundhara Jagdale (<vasundhara.jagdale@clogeny.com>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
-require "chef/knife/openstack_helpers"
-require "chef/knife/cloud/openstack_service_options"
-require "chef/knife/cloud/openstack_service"
+require_relative "openstack_helpers"
+require_relative "cloud/openstack_service_options"
+require_relative "cloud/openstack_service"
 require "chef/knife/cloud/command"
 
 class Chef
@@ -17,10 +31,9 @@ class Chef
         banner "knife openstack floating_ip disassociate IP (options)"
 
         option :instance_id,
-               long: "--instance-id ID",
-               description: "Instance id to disassociate with.",
-               proc: proc { |key| Chef::Config[:knife][:instance_id] = key },
-               required: true
+          long: "--instance-id ID",
+          description: "Instance id to disassociate with.",
+          required: true
 
         def execute_command
           if @name_args[0]
@@ -30,9 +43,9 @@ class Chef
             exit 1
           end
 
+          response = @service.disassociate_address(config[:instance_id], floating_ip)
           if response && response.status == 202
-            response =  @service.disassociate_address(instance_id, floating_ip)
-            ui.info "Floating IP #{floating_ip} disassociated with Instance #{locate_config_value(:instance_id)}"
+            ui.info "Floating IP #{floating_ip} disassociated with Instance #{config[:instance_id]}"
           end
         end
       end

data/lib/chef/knife/openstack_floating_ip_list.rb

@@ -1,10 +1,24 @@
-# frozen_string_literal: true
+#
 # Author:: Vasundhara Jagdale (<vasundhara.jagdale@clogeny.com>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright 2015-2020 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 require "chef/knife/cloud/list_resource_command"
-require "chef/knife/openstack_helpers"
-require "chef/knife/cloud/openstack_service_options"
+require_relative "openstack_helpers"
+require_relative "cloud/openstack_service_options"
 
 class Chef
   class Knife

data/lib/chef/knife/openstack_floating_ip_release.rb

@@ -1,11 +1,23 @@
-# frozen_string_literal: true
 #
 # Author:: Vasundhara Jagdale (<vasundhara.jagdale@clogeny.com>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright 2015-2020 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 
-require "chef/knife/openstack_helpers"
-require "chef/knife/cloud/openstack_service_options"
+require_relative "openstack_helpers"
+require_relative "cloud/openstack_service_options"
 require "chef/knife/cloud/command"
 
 class Chef

data/lib/chef/knife/openstack_group_list.rb

@@ -1,7 +1,24 @@
-# frozen_string_literal: true
+#
+# Copyright:: Copyright 2018 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require "chef/knife/cloud/list_resource_command"
-require "chef/knife/openstack_helpers"
-require "chef/knife/cloud/openstack_service_options"
+require_relative "openstack_helpers"
+require_relative "cloud/openstack_service_options"
+require "chef/json_compat"
 
 class Chef
   class Knife
@@ -16,7 +33,7 @@ class Chef
           @service.connection.security_groups
         rescue Excon::Errors::BadRequest => e
           response = Chef::JSONCompat.from_json(e.response.body)
-          ui.fatal("Unknown server error (#{response['badRequest']['code']}): #{response['badRequest']['message']}")
+          ui.fatal("Unknown server error (#{response["badRequest"]["code"]}): #{response["badRequest"]["message"]}")
           raise e
         end
 

data/lib/chef/knife/openstack_helpers.rb

@@ -1,5 +1,21 @@
-# frozen_string_literal: true
-require "chef/knife/cloud/openstack_service_options"
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative "cloud/openstack_service_options"
 
 class Chef
   class Knife
@@ -18,7 +34,7 @@ class Chef
         end
 
         def create_service_instance
-          OpenstackService.new
+          OpenstackService.new(config: config)
         end
 
         def validate!
@@ -32,7 +48,7 @@ class Chef
             ips.each do |ip|
               version = "IPv6" if ip["version"] == 6
               version = "IPv4" if ip["version"] == 4
-              info << "#{addresses.keys[0]}:#{version}: #{ip['addr']}"
+              info << "#{addresses.keys[0]}:#{version}: #{ip["addr"]}"
             end
           end
           info.join(" ")

data/lib/chef/knife/openstack_image_list.rb

@@ -1,10 +1,24 @@
-# frozen_string_literal: true
+#
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright 2014-2020 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 require "chef/knife/cloud/list_resource_command"
-require "chef/knife/openstack_helpers"
-require "chef/knife/cloud/openstack_service_options"
+require_relative "openstack_helpers"
+require_relative "cloud/openstack_service_options"
 
 class Chef
   class Knife
@@ -16,10 +30,10 @@ class Chef
         banner "knife openstack image list (options)"
 
         option :disable_filter,
-               long: "--disable-filter",
-               description: "Disable filtering of the image list. Currently filters names ending with 'initrd' or 'kernel'",
-               boolean: true,
-               default: false
+          long: "--disable-filter",
+          description: "Disable filtering of the image list. Currently filters names ending with 'initrd' or 'kernel'",
+          boolean: true,
+          default: false
 
         def before_exec_command
           # set resource_filters

data/lib/chef/knife/openstack_network_list.rb

@@ -1,10 +1,24 @@
-# frozen_string_literal: true
+#
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright 2014-2020 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 require "chef/knife/cloud/list_resource_command"
-require "chef/knife/openstack_helpers"
-require "chef/knife/cloud/openstack_service_options"
+require_relative "openstack_helpers"
+require_relative "cloud/openstack_service_options"
 
 class Chef
   class Knife

data/lib/chef/knife/openstack_server_create.rb

@@ -1,9 +1,9 @@
-# frozen_string_literal: true
 #
-# Author:: Seth Chisamore (<schisamo@getchef.com>)
-# Author:: Matt Ray (<matt@getchef.com>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Author:: Matt Ray (<matt@chef.io>)
 # Author:: Chirag Jog (<chirag@clogeny.com>)
-# Copyright:: Copyright (c) 2011-2014 Chef Software, Inc.
+# Author:: Lance Albertson (<lance@osuosl.org>)
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,10 +20,10 @@
 #
 
 require "chef/knife/cloud/server/create_command"
-require "chef/knife/openstack_helpers"
-require "chef/knife/cloud/openstack_server_create_options"
-require "chef/knife/cloud/openstack_service"
-require "chef/knife/cloud/openstack_service_options"
+require_relative "openstack_helpers"
+require_relative "cloud/openstack_server_create_options"
+require_relative "cloud/openstack_service"
+require_relative "cloud/openstack_service_options"
 require "chef/knife/cloud/exceptions"
 
 class Chef
@@ -43,19 +43,19 @@ class Chef
             server_def: {
               # servers require a name, knife-cloud generates the chef_node_name
               :name => config[:chef_node_name],
-              :image_ref => service.get_image(locate_config_value(:image)).id,
-              :flavor_ref => service.get_flavor(locate_config_value(:flavor)).id,
-              :security_groups => locate_config_value(:openstack_security_groups),
-              :availability_zone => locate_config_value(:availability_zone),
-              "os:scheduler_hints" => locate_config_value(:openstack_scheduler_hints),
-              :metadata => locate_config_value(:metadata),
-              :key_name => locate_config_value(:openstack_ssh_key_id),
+              :image_ref => service.get_image(config[:image]).id,
+              :flavor_ref => service.get_flavor(config[:flavor]).id,
+              :security_groups => config[:openstack_security_groups],
+              :availability_zone => config[:availability_zone],
+              "os:scheduler_hints" => config[:openstack_scheduler_hints],
+              :metadata => config[:metadata],
+              :key_name => config[:openstack_ssh_key_id],
             },
-            server_create_timeout: locate_config_value(:server_create_timeout),
+            server_create_timeout: config[:server_create_timeout],
           }
-          unless locate_config_value(:openstack_volumes).nil?
+          unless config[:openstack_volumes].nil?
             counter = 99
-            @create_options[:server_def][:block_device_mapping] = locate_config_value(:openstack_volumes).map do |vol|
+            @create_options[:server_def][:block_device_mapping] = config[:openstack_volumes].map do |vol|
               counter += 1
               {
                 volume_id: vol,
@@ -66,8 +66,8 @@ class Chef
             end
           end
 
-          @create_options[:server_def][:user_data] = locate_config_value(:user_data) if locate_config_value(:user_data)
-          @create_options[:server_def][:nics] = locate_config_value(:network_ids).map { |nic| nic_id = { "net_id" => nic } } if locate_config_value(:network_ids)
+          @create_options[:server_def][:user_data] = config[:user_data] if config[:user_data]
+          @create_options[:server_def][:nics] = config[:network_ids].map { |nic| nic_id = { "net_id" => nic } } if config[:network_ids]
 
           Chef::Log.debug("Create server params - server_def = #{@create_options[:server_def]}")
           # set columns_with_info map
@@ -94,7 +94,7 @@ class Chef
           msg_pair("Public IP Address", primary_public_ip_address(server.addresses)) if primary_public_ip_address(server.addresses)
           msg_pair("Private IP Address", primary_private_ip_address(server.addresses)) if primary_private_ip_address(server.addresses)
 
-          floating_address = locate_config_value(:openstack_floating_ip)
+          floating_address = config[:openstack_floating_ip]
           bind_ip = primary_network_ip_address(server.addresses, server.addresses.keys[0])
           Chef::Log.debug("Floating IP Address requested #{floating_address}")
           unless floating_address == "-1" # no floating IP requested
@@ -140,10 +140,10 @@ class Chef
           super
 
           # Use SSH password either specified from command line or from openstack server instance
-          config[:ssh_password] = locate_config_value(:ssh_password) || server.password unless config[:openstack_ssh_key_id]
+          config[:ssh_password] = config[:ssh_password] || server.password unless config[:openstack_ssh_key_id]
 
-          # The bootstrap network is always initialised to 'public' when a network name isn't specified.  Therefore,
-          # only set the bootstrap network to 'private' if still initialised to public and nothing was specified for
+          # The bootstrap network is always initialized to 'public' when a network name isn't specified.  Therefore,
+          # only set the bootstrap network to 'private' if still initialized to public and nothing was specified for
           # the private network name.
           config[:bootstrap_network] = "private" if config[:private_network] && config[:bootstrap_network] == "public"
 
@@ -172,51 +172,52 @@ class Chef
 
         def validate_params!
           # set param vm_name to a random value if the name is not set by the user (plugin)
-          config[:chef_node_name] = get_node_name(locate_config_value(:chef_node_name), locate_config_value(:chef_node_name_prefix))
+          config[:chef_node_name] = get_node_name(config[:chef_node_name], config[:chef_node_name_prefix])
 
           errors = []
 
-          if locate_config_value(:bootstrap_protocol) == "winrm"
-            if locate_config_value(:winrm_password).nil?
-              errors << "You must provide Winrm Password."
+          if config[:connection_protocol] == "winrm"
+            if config[:connection_password].nil?
+              errors << "You must provide Connection Password."
             end
-          elsif locate_config_value(:bootstrap_protocol) != "ssh"
+          elsif config[:connection_protocol] != "ssh"
             errors << "You must provide a valid bootstrap protocol. options [ssh/winrm]. For linux type images, options [ssh]"
           end
 
-          errors << "You must provide --image-os-type option [windows/linux]" unless %w{windows linux}.include?(locate_config_value(:image_os_type))
+          errors << "You must provide --image-os-type option [windows/linux]" unless %w{windows linux}.include?(config[:image_os_type])
           error_message = ""
           raise CloudExceptions::ValidationError, error_message if errors.each { |e| ui.error(e); error_message = "#{error_message} #{e}." }.any?
         end
 
         def is_image_valid?
-          service.get_image(locate_config_value(:image)).nil? ? false : true
+          service.get_image(config[:image]).nil? ? false : true
         end
 
         def is_flavor_valid?
-          service.get_flavor(locate_config_value(:flavor)).nil? ? false : true
+          service.get_flavor(config[:flavor]).nil? ? false : true
         end
 
         def is_floating_ip_valid?
-          address = locate_config_value(:openstack_floating_ip)
+          address = config[:openstack_floating_ip]
 
           return true if address == "-1" # no floating IP requested
 
           addresses = service.connection.addresses
           return false if addresses.empty? # no floating IPs
+
           # floating requested without value
           if address.nil?
             if addresses.find_index { |a| a.fixed_ip.nil? }
-              return true
+              true
             else
-              return false # no floating IPs available
+              false # no floating IPs available
             end
           else
             # floating requested with value
             if addresses.find_index { |a| a.ip == address }
-              return true
+              true
             else
-              return false # requested floating IP does not exist
+              false # requested floating IP does not exist
             end
           end
         end

data/lib/chef/knife/openstack_server_delete.rb

@@ -1,15 +1,27 @@
-# frozen_string_literal: true
 #
 # Author:: Siddheshwar More (<siddheshwar.more@clogeny.com>)
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Chef Software, Inc.
+# Copyright:: Copyright 2013-2020 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 
 require "chef/knife/cloud/server/delete_options"
 require "chef/knife/cloud/server/delete_command"
-require "chef/knife/cloud/openstack_service"
-require "chef/knife/cloud/openstack_service_options"
-require "chef/knife/openstack_helpers"
+require_relative "cloud/openstack_service"
+require_relative "cloud/openstack_service_options"
+require_relative "openstack_helpers"
 
 class Chef
   class Knife