knife-openstack 2.1.0 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3a29b5e000e62f43f3372bd4fb9d498e3bbc92c2
-  data.tar.gz: 623f77f926e18fbb88577983458e7188e7ac09ba
+SHA256:
+  metadata.gz: a023b1f5b4b0c855a8e5d5c2867a5624a3ab6b469368cc182a44ac8c84357f2c
+  data.tar.gz: 79a5238b5dbbd5e1b08a077de6a07b2b3895a57cb6743987aa47b135893e4179
 SHA512:
-  metadata.gz: 6a2a31b7e81b7c15d32606c83505a6e8e4d87822ffda0673aa4e974fda09976b66649172b534bf710cf01a6a5b3f6beea3dc2b80e566f5198bc9a6ce0ee6032e
-  data.tar.gz: 554bd1d53c99afc1d489c7fdd82c4915ae40c5843dcc5ad20bb2136bdebf4bbed24f3c965a69869a915d9e9c1cfa80a30c31f35c2d084d7f351d56f6bbadd455
+  metadata.gz: 5e2b410b73c11c3601697bd362a8ec7f340268c91793279ea2f86b12eb2b6b4cc0f3a5664754d399f68c0b3a29ff15415940907b124525d5e95739278f69bf4b
+  data.tar.gz: 3ad615b18db0d3a94173773288c90daddb8411a06279cadae771cd5ea8f46b97eeb61a9e4347742802474c2997e836f65fdebaee51bc368444395c8bda968742

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

@@ -1,5 +1,20 @@
+#
+# 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.
+#
 
-# frozen_string_literal: true
 require "chef/knife/cloud/server/create_options"
 
 class Chef
@@ -12,82 +27,80 @@ 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"
 
             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"
 
             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"
 
             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, 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 }
+              long: "--secret-file SECRET_FILE",
+              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 }
+              long: "--secret ",
+              description: "The secret key to use to encrypt data bag item values"
           end
         end
       end

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

@@ -1,30 +1,46 @@
-# frozen_string_literal: true
 #
 # Author:: Siddheshwar More (<siddheshwar.more@clogeny.com>)
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright (c) 2013 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");
+# 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/fog/service"
+require "fog/openstack"
 
 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)
@@ -46,23 +62,23 @@ 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],
             },
           }
 
           (
-            Fog::Compute::OpenStack.requirements +
-            Fog::Compute::OpenStack.recognized -
+            Fog::OpenStack::Compute.requirements +
+            Fog::OpenStack::Compute.recognized -
             [:openstack_api_key]
           ).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,4 +1,20 @@
-# frozen_string_literal: true
+#
+# 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/cloud/fog/options"
 class Chef
   class Knife
@@ -9,39 +25,33 @@ 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"
 
             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"
 
             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"
 
             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"
 
             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)"
 
             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
           end
         end
       end

data/lib/chef/knife/openstack_flavor_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_floating_ip_allocate.rb

@@ -1,9 +1,23 @@
-# 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_relative "openstack_helpers"
+require_relative "cloud/openstack_service_options"
 require "chef/knife/cloud/command"
 
 class Chef
@@ -16,13 +30,12 @@ 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."
 
         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,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 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.",
+          required: true
 
         def execute_command
           if @name_args[0]
@@ -30,9 +43,9 @@ class Chef
             exit 1
           end
 
-          response = @service.associate_address(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