knife-openstack 3.0.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 893c5909a78491c4fc25e39572e7360a9a7a15cb977e901032598ecb2461c179
-  data.tar.gz: f4e8d63647fc7ffb3a090ead708749f3195850ba079519f8a54d4b1d0ca0afd5
+  metadata.gz: fea575415f8293a82e3549df15fe0904421689eb1501ecde02f6c763e5d11567
+  data.tar.gz: df4336564c9df6eb7dc4360169dd6d843614222e1092085ed54183abea88513e
 SHA512:
-  metadata.gz: e4dfe6c74483e8ebc2c16cb358c8ce0149e03a1733aa4fa82d53a340b552b4c3f87d7a940db1b9a1126a4e451ed0b12bc32b8a211b10fdc05d386a48f43eeef9
-  data.tar.gz: 39714c903a74e9ae4032cefe23ad8284d587fab9273b750797f238a288fd1155734e23f03285b3a1b53f690ac8739b672a912660849fee067f732dc99efc1f59
+  metadata.gz: f69a9955f12b7ebfee46e574b9929ac71a248b151c2a64ada9b50b3d59b124118e188b6ce7cd828505e254d10d14ea6c3cc089ea7d02d163c59abd1f7e0d9912
+  data.tar.gz: 8731570f7c7cc4e7a15a53c8f9ff1e733c3e79db7957fbd53b6e7345751b9268cce77ee98e6bb6b4e9130b5c30a89aac0661bbb01b64117d396b65ee770c7190

data/lib/chef/knife/cloud/openstack_server_create_options.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2018 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");
@@ -45,8 +45,7 @@ class Chef
 
             option :openstack_scheduler_hints,
               long: "--scheduler-hints HINTS",
-              description: "A scheduler group hint to OpenStack",
-              proc: proc { |i| Chef::Config[:knife][:openstack_scheduler_hints] = i }
+              description: "A scheduler group hint to OpenStack"
 
             option :openstack_security_groups,
               short: "-G X,Y,Z",
@@ -58,8 +57,7 @@ class Chef
             option :openstack_ssh_key_id,
               short: "-S KEY",
               long: "--openstack-ssh-key-id KEY",
-              description: "The OpenStack SSH keypair id",
-              proc: proc { |key| Chef::Config[:knife][:openstack_ssh_key_id] = key }
+              description: "The OpenStack SSH keypair id"
 
             option :user_data,
               long: "--user-data USER_DATA",
@@ -85,24 +83,24 @@ class Chef
             option :availability_zone,
               short: "-Z ZONE_NAME",
               long: "--availability-zone ZONE_NAME",
-              description: "The availability zone for this server",
-              proc: proc { |z| Chef::Config[:knife][:availability_zone] = z }
+              description: "The availability zone for this server"
 
             option :metadata,
               short: "-M X=1",
               long: "--metadata X=1",
               description: "Metadata information for this server (may pass multiple times)",
-              proc: proc { |data| Chef::Config[:knife][:metadata] ||= {}; Chef::Config[:knife][:metadata].merge!(data.split("=")[0] => data.split("=")[1]) }
+              proc: proc { |data, accumulator|
+                accumulator ||= {}
+                accumulator.merge!(data.split("=")[0] => data.split("=")[1])
+              }
 
             option :secret_file,
               long: "--secret-file SECRET_FILE",
-              description: "A file containing the secret key to use to encrypt data bag item values",
-              proc: proc { |sf| Chef::Config[:knife][:secret_file] = sf }
+              description: "A file containing the secret key to use to encrypt data bag item values"
 
             option :secret,
               long: "--secret ",
-              description: "The secret key to use to encrypt data bag item values",
-              proc: proc { |s| Chef::Config[:knife][:secret] = s }
+              description: "The secret key to use to encrypt data bag item values"
           end
         end
       end

data/lib/chef/knife/cloud/openstack_service.rb

@@ -2,7 +2,7 @@
 # Author:: Siddheshwar More (<siddheshwar.more@clogeny.com>)
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Author:: Lance Albertson(<lance@osuosl.org>)
-# Copyright:: Copyright 2013-2020 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");
@@ -25,20 +25,22 @@ 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]}")
-          Chef::Log.debug("openstack_region #{Chef::Config[:knife][:openstack_region]}")
+        def initialize(config:, **kwargs)
+          super(config: config, **kwargs)
 
-          super(options.merge(auth_params: get_auth_params))
+          Chef::Log.debug("openstack_username #{config[:openstack_username]}")
+          Chef::Log.debug("openstack_auth_url #{config[:openstack_auth_url]}")
+          Chef::Log.debug("openstack_tenant #{config[:openstack_tenant]}")
+          Chef::Log.debug("openstack_endpoint_type #{config[:openstack_endpoint_type] || "publicURL"}")
+          Chef::Log.debug("openstack_insecure #{config[:openstack_insecure]}")
+          Chef::Log.debug("openstack_region #{config[:openstack_region]}")
+
+          @auth_params = get_auth_params
         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: config[:api_endpoint]) unless config[:api_endpoint].nil?
         end
 
         def get_server(search_term)
@@ -60,11 +62,10 @@ class Chef
         end
 
         def get_auth_params
-          load_fog_gem
           params = {
             provider: "OpenStack",
             connection_options: {
-              ssl_verify_peer: !Chef::Config[:knife][:openstack_insecure],
+              ssl_verify_peer: !config[:openstack_insecure],
             },
           }
 
@@ -75,9 +76,9 @@ class Chef
           ).each do |k|
             next unless k.to_s.start_with?("openstack")
 
-            params[k] = Chef::Config[:knife][k]
+            params[k] = config[k]
           end
-          params[:openstack_api_key] = Chef::Config[:knife][:openstack_password] || Chef::Config[:knife][:openstack_api_key]
+          params[:openstack_api_key] = config[:openstack_password] || config[:openstack_api_key]
 
           params
         end

data/lib/chef/knife/cloud/openstack_service_options.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2018 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");
@@ -27,37 +27,31 @@ class Chef
             option :openstack_username,
               short: "-A USERNAME",
               long: "--openstack-username KEY",
-              description: "Your OpenStack Username",
-              proc: proc { |key| Chef::Config[:knife][:openstack_username] = key }
+              description: "Your OpenStack Username"
 
             option :openstack_password,
               short: "-K SECRET",
               long: "--openstack-password SECRET",
-              description: "Your OpenStack Password",
-              proc: proc { |key| Chef::Config[:knife][:openstack_password] = key }
+              description: "Your OpenStack Password"
 
             option :openstack_tenant,
               short: "-T NAME",
               long: "--openstack-tenant NAME",
-              description: "Your OpenStack Tenant NAME",
-              proc: proc { |key| Chef::Config[:knife][:openstack_tenant] = key }
+              description: "Your OpenStack Tenant NAME"
 
             option :openstack_auth_url,
               long: "--openstack-api-endpoint ENDPOINT",
-              description: "Your OpenStack API endpoint",
-              proc: proc { |endpoint| Chef::Config[:knife][:openstack_auth_url] = endpoint }
+              description: "Your OpenStack API endpoint"
 
             option :openstack_endpoint_type,
               long: "--openstack-endpoint-type ENDPOINT_TYPE",
-              description: "OpenStack endpoint type to use (publicURL, internalURL, adminURL)",
-              proc: proc { |type| Chef::Config[:knife][:openstack_endpoint_type] = type }
+              description: "OpenStack endpoint type to use (publicURL, internalURL, adminURL)"
 
             option :openstack_insecure,
               long: "--insecure",
               description: "Ignore SSL certificate on the Auth URL",
               boolean: true,
-              default: false,
-              proc: proc { |key| Chef::Config[:knife][:openstack_insecure] = key }
+              default: false
           end
         end
       end

data/lib/chef/knife/openstack_floating_ip_allocate.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Vasundhara Jagdale (<vasundhara.jagdale@clogeny.com>)
-# Copyright:: Copyright 2015-2020 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");
@@ -32,11 +32,10 @@ class Chef
         option :pool,
           short: "-p POOL",
           long: "--pool POOL",
-          description: "Floating IP pool to allocate from.",
-          proc: proc { |key| Chef::Config[:knife][:pool] = key }
+          description: "Floating IP pool to allocate from."
 
         def execute_command
-          @resource = @service.allocate_address(locate_config_value(:pool))
+          @resource = @service.allocate_address(config[:pool])
         end
 
         def after_exec_command

data/lib/chef/knife/openstack_floating_ip_associate.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Vasundhara Jagdale (<vasundhara.jagdale@clogeny.com>)
-# Copyright:: Copyright 2015-2020 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");
@@ -33,7 +33,6 @@ class Chef
         option :instance_id,
           long: "--instance-id ID",
           description: "Instance id to associate it with.",
-          proc: proc { |key| Chef::Config[:knife][:instance_id] = key },
           required: true
 
         def execute_command
@@ -44,9 +43,9 @@ class Chef
             exit 1
           end
 
-          response = @service.associate_address(locate_config_value(:instance_id), floating_ip)
+          response = @service.associate_address(config[:instance_id], floating_ip)
           if response && response.status == 202
-            ui.info "Floating IP #{floating_ip} associated with Instance #{locate_config_value(:instance_id)}"
+            ui.info "Floating IP #{floating_ip} associated with Instance #{config[:instance_id]}"
           end
         end
       end

data/lib/chef/knife/openstack_floating_ip_disassociate.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Vasundhara Jagdale (<vasundhara.jagdale@clogeny.com>)
-# Copyright:: Copyright 2015-2020 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");
@@ -33,7 +33,6 @@ class Chef
         option :instance_id,
           long: "--instance-id ID",
           description: "Instance id to disassociate with.",
-          proc: proc { |key| Chef::Config[:knife][:instance_id] = key },
           required: true
 
         def execute_command
@@ -44,9 +43,9 @@ class Chef
             exit 1
           end
 
-          response = @service.disassociate_address(locate_config_value(:instance_id), floating_ip)
+          response = @service.disassociate_address(config[:instance_id], floating_ip)
           if response && response.status == 202
-            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_helpers.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2018 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");
@@ -34,7 +34,7 @@ class Chef
         end
 
         def create_service_instance
-          OpenstackService.new
+          OpenstackService.new(config: config)
         end
 
         def validate!

data/lib/chef/knife/openstack_server_create.rb

@@ -3,7 +3,7 @@
 # Author:: Matt Ray (<matt@chef.io>)
 # Author:: Chirag Jog (<chirag@clogeny.com>)
 # Author:: Lance Albertson (<lance@osuosl.org>)
-# Copyright:: Copyright 2011-2020 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");
@@ -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,7 +140,7 @@ 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
@@ -172,33 +172,33 @@ 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(:connection_protocol) == "winrm"
-            if locate_config_value(:connection_password).nil?
+          if config[:connection_protocol] == "winrm"
+            if config[:connection_password].nil?
               errors << "You must provide Connection Password."
             end
-          elsif locate_config_value(:connection_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
 

data/lib/knife-openstack/version.rb

@@ -1,7 +1,7 @@
 #
 module Knife
   module OpenStack
-    VERSION = "3.0.1".freeze
+    VERSION = "4.0.0".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-openstack
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - JJ Asghar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-openstack
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15'
+        version: '15.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15'
+        version: '15.11'
 - !ruby/object:Gem::Dependency
   name: knife-cloud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 description: A Chef Infra knife plugin for OpenStack clouds.
 email:
 - jj@chef.io