knife-openstack 2.1.1 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfa0c53f56548c1af249130a2e7f9857d5381acc9903960900a89b305008b00f
-  data.tar.gz: 7f134cec3f720164ebd217434b1744d00738cc50ebaaa74df918b26e7cefe683
+  metadata.gz: a2a2d48a5b5ac264c9693312144b757c2503b2a1b3b5c753e95ac26bac56dacd
+  data.tar.gz: ef663091c0af5196958e52476a08cc2fb90a795f6f78d4ab188a257139c0c22a
 SHA512:
-  metadata.gz: d7f3163d3573e2c4372e244abf392a423b5be37e10b35915edbb2c2ecfedfac540b329a0db523255ca4b04b4ac78611c17d60f7985aa4539cb0e571cf3db698e
-  data.tar.gz: cf4df4f3cfdf1d5f4d2b6d6a89dc545660a9808fdc5eda0c255bcfc1e6890490ce51e47e2eb9a092ee255f02cd25d86c1a6e26b8147b1ccbf483717119dc7299
+  metadata.gz: 38175ab08d67e201464005acf13f2bbaecf89596b9b153075d489798a1bb7d1d50e5d78bef3430a7ff9a81707e377e47807de236c8e0c6c2b15ac6c154b97513
+  data.tar.gz: 6ac31de76145bfcd50d0ad0d3d5372d702fdc64872b50734196d3fb5757875d0421e8c8b56ced7f2a2a83af3fd1fee6597e97ba1b10a3fcdf275c67abf2de91e

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

@@ -27,82 +27,82 @@ class Chef
 
             # Openstack Server create params.
             option :private_network,
-                   long: "--openstack-private-network",
-                   description: "Use the private IP for bootstrapping rather than the public IP",
-                   boolean: true,
-                   default: false
+              long: "--openstack-private-network",
+              description: "Use the private IP for bootstrapping rather than the public IP",
+              boolean: true,
+              default: false
 
             option :openstack_floating_ip,
-                   short: "-a [IP]",
-                   long: "--openstack-floating-ip [IP]",
-                   default: "-1",
-                   description: "Request to associate a floating IP address to the new OpenStack node. Assumes IPs have been allocated to the project. Specific IP is optional."
+              short: "-a [IP]",
+              long: "--openstack-floating-ip [IP]",
+              default: "-1",
+              description: "Request to associate a floating IP address to the new OpenStack node. Assumes IPs have been allocated to the project. Specific IP is optional."
 
             option :openstack_volumes,
-                   long: "--openstack-volumes VOLUME1,VOLUME2,VOLUME3",
-                   description: "Comma separated list of the UUID(s) of the volume(s) to attach to the server",
-                   proc: proc { |volumes| volumes.split(",") }
+              long: "--openstack-volumes VOLUME1,VOLUME2,VOLUME3",
+              description: "Comma separated list of the UUID(s) of the volume(s) to attach to the server",
+              proc: proc { |volumes| volumes.split(",") }
 
             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 }
+              long: "--scheduler-hints HINTS",
+              description: "A scheduler group hint to OpenStack",
+              proc: proc { |i| Chef::Config[:knife][:openstack_scheduler_hints] = i }
 
             option :openstack_security_groups,
-                   short: "-G X,Y,Z",
-                   long: "--openstack-groups X,Y,Z",
-                   description: "The security groups for this server",
-                   default: ["default"],
-                   proc: proc { |groups| groups.split(",") }
+              short: "-G X,Y,Z",
+              long: "--openstack-groups X,Y,Z",
+              description: "The security groups for this server",
+              default: ["default"],
+              proc: proc { |groups| groups.split(",") }
 
             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 }
+              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 }
 
             option :user_data,
-                   long: "--user-data USER_DATA",
-                   description: "The file path containing user data information for this server",
-                   proc: proc { |user_data| open(user_data, &:read) }
+              long: "--user-data USER_DATA",
+              description: "The file path containing user data information for this server",
+              proc: proc { |user_data| open(user_data, &:read) }
 
             option :bootstrap_network,
-                   long: "--bootstrap-network NAME",
-                   default: "public",
-                   description: "Specify network for bootstrapping. Default is 'public'."
+              long: "--bootstrap-network NAME",
+              default: "public",
+              description: "Specify network for bootstrapping. Default is 'public'."
 
             option :network,
-                   long: "--no-network",
-                   boolean: true,
-                   default: true,
-                   description: "Use first available network for bootstrapping if 'public' and 'private' are unavailable."
+              long: "--no-network",
+              boolean: true,
+              default: true,
+              description: "Use first available network for bootstrapping if 'public' and 'private' are unavailable."
 
             option :network_ids,
-                   long: "--network-ids NETWORK_ID_1,NETWORK_ID_2,NETWORK_ID_3",
-                   description: "Comma separated list of the UUID(s) of the network(s) for the server to attach",
-                   proc: proc { |networks| networks.split(",") }
+              long: "--network-ids NETWORK_ID_1,NETWORK_ID_2,NETWORK_ID_3",
+              description: "Comma separated list of the UUID(s) of the network(s) for the server to attach",
+              proc: proc { |networks| networks.split(",") }
 
             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 }
+              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 }
 
             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]) }
+              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]) }
 
             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 }
+              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 }
 
             option :secret,
-                   long: "--secret ",
-                   description: "The secret key to use to encrypt data bag item values",
-                   proc: proc { |s| Chef::Config[:knife][:secret] = s }
+              long: "--secret ",
+              description: "The secret key to use to encrypt data bag item values",
+              proc: proc { |s| Chef::Config[:knife][:secret] = s }
           end
         end
       end

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

@@ -27,7 +27,7 @@ class Chef
           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]}")
 
@@ -72,6 +72,7 @@ class Chef
             [: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]

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

@@ -25,39 +25,39 @@ class Chef
             include FogOptions
             # Openstack Connection params.
             option :openstack_username,
-                   short: "-A USERNAME",
-                   long: "--openstack-username KEY",
-                   description: "Your OpenStack Username",
-                   proc: proc { |key| Chef::Config[:knife][:openstack_username] = key }
+              short: "-A USERNAME",
+              long: "--openstack-username KEY",
+              description: "Your OpenStack Username",
+              proc: proc { |key| Chef::Config[:knife][:openstack_username] = key }
 
             option :openstack_password,
-                   short: "-K SECRET",
-                   long: "--openstack-password SECRET",
-                   description: "Your OpenStack Password",
-                   proc: proc { |key| Chef::Config[:knife][:openstack_password] = key }
+              short: "-K SECRET",
+              long: "--openstack-password SECRET",
+              description: "Your OpenStack Password",
+              proc: proc { |key| Chef::Config[:knife][:openstack_password] = key }
 
             option :openstack_tenant,
-                   short: "-T NAME",
-                   long: "--openstack-tenant NAME",
-                   description: "Your OpenStack Tenant NAME",
-                   proc: proc { |key| Chef::Config[:knife][:openstack_tenant] = key }
+              short: "-T NAME",
+              long: "--openstack-tenant NAME",
+              description: "Your OpenStack Tenant NAME",
+              proc: proc { |key| Chef::Config[:knife][:openstack_tenant] = key }
 
             option :openstack_auth_url,
-                   long: "--openstack-api-endpoint ENDPOINT",
-                   description: "Your OpenStack API endpoint",
-                   proc: proc { |endpoint| Chef::Config[:knife][:openstack_auth_url] = endpoint }
+              long: "--openstack-api-endpoint ENDPOINT",
+              description: "Your OpenStack API endpoint",
+              proc: proc { |endpoint| Chef::Config[:knife][:openstack_auth_url] = 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 }
+              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 }
 
             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 }
+              long: "--insecure",
+              description: "Ignore SSL certificate on the Auth URL",
+              boolean: true,
+              default: false,
+              proc: proc { |key| Chef::Config[:knife][:openstack_insecure] = key }
           end
         end
       end

data/lib/chef/knife/openstack_flavor_list.rb

@@ -17,8 +17,8 @@
 #
 
 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_allocate.rb

@@ -16,8 +16,8 @@
 # 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
@@ -30,10 +30,10 @@ class Chef
         banner "knife openstack floating_ip allocate (options)"
 
         option :pool,
-               short: "-p POOL",
-               long: "--pool POOL",
-               description: "Floating IP pool to allocate from.",
-               proc: proc { |key| Chef::Config[:knife][:pool] = key }
+          short: "-p POOL",
+          long: "--pool POOL",
+          description: "Floating IP pool to allocate from.",
+          proc: proc { |key| Chef::Config[:knife][:pool] = key }
 
         def execute_command
           @resource = @service.allocate_address(locate_config_value(:pool))

data/lib/chef/knife/openstack_floating_ip_associate.rb

@@ -16,9 +16,9 @@
 # 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
@@ -31,10 +31,10 @@ class Chef
         banner "knife openstack floating_ip associate IP (options)"
 
         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
+          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
           if @name_args[0]

data/lib/chef/knife/openstack_floating_ip_disassociate.rb

@@ -16,9 +16,9 @@
 # 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
@@ -31,10 +31,10 @@ 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.",
+          proc: proc { |key| Chef::Config[:knife][:instance_id] = key },
+          required: true
 
         def execute_command
           if @name_args[0]

data/lib/chef/knife/openstack_floating_ip_list.rb

@@ -17,8 +17,8 @@
 #
 
 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

@@ -16,8 +16,8 @@
 # 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

@@ -16,8 +16,8 @@
 #
 
 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
@@ -33,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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "chef/knife/cloud/openstack_service_options"
+require_relative "cloud/openstack_service_options"
 
 class Chef
   class Knife
@@ -48,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

@@ -17,8 +17,8 @@
 #
 
 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
@@ -30,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

@@ -17,8 +17,8 @@
 #
 
 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

@@ -19,10 +19,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
@@ -203,6 +203,7 @@ class Chef
 
           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? }

data/lib/chef/knife/openstack_server_delete.rb

@@ -19,9 +19,9 @@
 
 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

data/lib/chef/knife/openstack_server_list.rb

@@ -20,8 +20,8 @@
 #
 
 require "chef/knife/cloud/server/list_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/knife/cloud/server/list_options"
 
 class Chef

data/lib/chef/knife/openstack_server_show.rb

@@ -16,10 +16,10 @@
 #
 
 require "chef/knife/cloud/server/show_command"
-require "chef/knife/openstack_helpers"
+require_relative "openstack_helpers"
 require "chef/knife/cloud/server/show_options"
-require "chef/knife/cloud/openstack_service"
-require "chef/knife/cloud/openstack_service_options"
+require_relative "cloud/openstack_service"
+require_relative "cloud/openstack_service_options"
 require "chef/knife/cloud/exceptions"
 
 class Chef

data/lib/chef/knife/openstack_volume_list.rb

@@ -19,8 +19,8 @@
 #
 
 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
@@ -36,7 +36,7 @@ class Chef
           @service.connection.volumes
         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
 
@@ -58,7 +58,7 @@ class Chef
             end
           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
           puts ui.list(volume_list, :uneven_columns_across, 5)

data/lib/knife-openstack/version.rb

@@ -1,7 +1,7 @@
 #
 module Knife
   module OpenStack
-    VERSION = "2.1.1".freeze
+    VERSION = "2.1.7".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: 2.1.1
+  version: 2.1.7
 platform: ruby
 authors:
 - JJ Asghar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -42,16 +42,22 @@ dependencies:
   name: knife-cloud
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: A Chef knife plugin for OpenStack clouds.
 email:
 - jj@chef.io
@@ -98,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Chef knife plugin for OpenStack clouds.