knife-openstack 1.3.2 → 2.0.0

data/Rakefile

@@ -1,14 +1,27 @@
+# frozen_string_literal: true
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Chef Software, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 
-require 'bundler'
-require 'bundler/setup'
-require 'bundler/gem_tasks'
-require 'rubocop/rake_task'
-require 'rspec/core/rake_task'
+require "bundler"
+require "bundler/setup"
+require "bundler/gem_tasks"
+require "chefstyle"
+require "rubocop/rake_task"
+require "rspec/core/rake_task"
+require "github_changelog_generator/task"
+require "knife-openstack/version"
 
 RuboCop::RakeTask.new
 
 RSpec::Core::RakeTask.new(:spec)
 
 task default: [:rubocop, :spec]
+
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.future_release = Knife::OpenStack::VERSION
+  config.max_issues = 0
+  config.add_issues_wo_labels = false
+  config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature".split(",")
+  config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(",")
+  config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question,Discussion,Tech Cleanup".split(",")
+end

data/knife-openstack.gemspec

@@ -1,28 +1,30 @@
 # -*- encoding: utf-8 -*-
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
-require 'knife-openstack/version'
+# frozen_string_literal: true
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+require "knife-openstack/version"
 
 Gem::Specification.new do |s|
-  s.name        = 'knife-openstack'
+  s.name        = "knife-openstack"
   s.version     = Knife::OpenStack::VERSION
-  s.version = "#{s.version}-alpha-#{ENV['TRAVIS_BUILD_NUMBER']}" if ENV['TRAVIS']
+  s.version = "#{s.version}-alpha-#{ENV['TRAVIS_BUILD_NUMBER']}" if ENV["TRAVIS"]
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
-  s.extra_rdoc_files = ['README.md', 'LICENSE']
-  s.authors     = ['JJ Asghar']
-  s.email       = ['jj@chef.io']
-  s.homepage    = 'https://github.com/chef/knife-openstack'
-  s.summary     = 'A Chef knife plugin for OpenStack clouds.'
-  s.description = 'A Chef knife plugin for OpenStack clouds.'
+  s.extra_rdoc_files = ["README.md", "LICENSE"]
+  s.authors     = ["JJ Asghar"]
+  s.email       = ["jj@chef.io"]
+  s.homepage    = "https://github.com/chef/knife-openstack"
+  s.summary     = "A Chef knife plugin for OpenStack clouds."
+  s.description = "A Chef knife plugin for OpenStack clouds."
+  s.license     = "Apache-2.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  s.require_paths = ['lib']
+  s.require_paths = ["lib"]
 
-  s.add_dependency 'fog', '~> 1.23'
-  s.add_dependency 'chef', '>= 11'
-  s.add_dependency 'knife-cloud', '~> 1.2.0'
+  s.required_ruby_version = ">= 2.2.2"
 
-  %w(bundler rubocop rake rspec-core rspec-expectations rspec-mocks rspec_junit_formatter).each { |gem| s.add_development_dependency gem }
+  s.add_dependency "fog", "~> 1.23"
+  s.add_dependency "chef", ">= 12"
+  s.add_dependency "knife-cloud", "~> 1.2.0"
 end

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

@@ -1,5 +1,6 @@
 
-require 'chef/knife/cloud/server/create_options'
+# frozen_string_literal: true
+require "chef/knife/cloud/server/create_options"
 
 class Chef
   class Knife
@@ -11,72 +12,72 @@ 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',
+                   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',
+                   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',
+                   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',
+                   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',
+                   long: "--bootstrap-network NAME",
+                   default: "public",
                    description: "Specify network for bootstrapping. Default is 'public'."
 
             option :network,
-                   long: '--no-network',
+                   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',
+                   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]) }
           end
         end
       end

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

@@ -1,10 +1,11 @@
+# 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
@@ -35,7 +36,7 @@ class Chef
             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
@@ -47,10 +48,10 @@ class Chef
         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],
+            },
           }
 
           (
@@ -58,7 +59,7 @@ class Chef
             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]

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

@@ -1,4 +1,5 @@
-require 'chef/knife/cloud/fog/options'
+# frozen_string_literal: true
+require "chef/knife/cloud/fog/options"
 class Chef
   class Knife
     class Cloud
@@ -8,41 +9,41 @@ class Chef
             include FogOptions
             # Openstack Connection params.
             option :openstack_username,
-                   short: '-A USERNAME',
-                   long: '--openstack-username KEY',
-                   description: 'Your OpenStack Username',
+                   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',
+                   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',
+                   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',
+                   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)',
+                   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',
+                   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
       end
     end
   end

data/lib/chef/knife/openstack_flavor_list.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 # Copyright:: Copyright (c) 2014 Chef Software, Inc.
 
-require 'chef/knife/cloud/list_resource_command'
-require 'chef/knife/openstack_helpers'
-require 'chef/knife/cloud/openstack_service_options'
+require "chef/knife/cloud/list_resource_command"
+require "chef/knife/openstack_helpers"
+require "chef/knife/cloud/openstack_service_options"
 
 class Chef
   class Knife
@@ -12,18 +13,18 @@ class Chef
         include OpenstackHelpers
         include OpenstackServiceOptions
 
-        banner 'knife openstack flavor list (options)'
+        banner "knife openstack flavor list (options)"
 
         def before_exec_command
           # set columns_with_info map
           @columns_with_info = [
-            { label: 'Name', key: 'name' },
-            { label: 'ID', key: 'id' },
-            { label: 'Virtual CPUs', key: 'vcpus' },
-            { label: 'RAM', key: 'ram', value_callback: method(:ram_in_mb) },
-            { label: 'Disk', key: 'disk', value_callback: method(:disk_in_gb) }
+            { label: "Name", key: "name" },
+            { label: "ID", key: "id" },
+            { label: "Virtual CPUs", key: "vcpus" },
+            { label: "RAM", key: "ram", value_callback: method(:ram_in_mb) },
+            { label: "Disk", key: "disk", value_callback: method(:disk_in_gb) },
           ]
-          @sort_by_field = 'name'
+          @sort_by_field = "name"
         end
 
         def query_resource

data/lib/chef/knife/openstack_floating_ip_allocate.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 # Author:: Vasundhara Jagdale (<vasundhara.jagdale@clogeny.com>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
 
-require 'chef/knife/openstack_helpers'
-require 'chef/knife/cloud/openstack_service_options'
-require 'chef/knife/cloud/command'
+require "chef/knife/openstack_helpers"
+require "chef/knife/cloud/openstack_service_options"
+require "chef/knife/cloud/command"
 
 class Chef
   class Knife
@@ -12,12 +13,12 @@ class Chef
         include OpenstackHelpers
         include OpenstackServiceOptions
 
-        banner 'knife openstack floating_ip allocate (options)'
+        banner "knife openstack floating_ip allocate (options)"
 
         option :pool,
-               short: '-p POOL',
-               long: '--pool POOL',
-               description: 'Floating IP pool to allocate from.',
+               short: "-p POOL",
+               long: "--pool POOL",
+               description: "Floating IP pool to allocate from.",
                proc: proc { |key| Chef::Config[:knife][:pool] = key }
 
         def execute_command
@@ -25,11 +26,11 @@ class Chef
         end
 
         def after_exec_command
-          @columns_with_info = [{ label: 'ID', value: @resource['floating_ip']['id'].to_s },
-                                { label: 'Instance ID', value: @resource['floating_ip']['instance_id'].to_s },
-                                { label: 'Floating IP', value: @resource['floating_ip']['ip'].to_s },
-                                { label: 'Fixed IP', value: @resource['floating_ip']['fixed_ip'].to_s },
-                                { label: 'Pool', value: @resource['floating_ip']['pool'].to_s }
+          @columns_with_info = [{ label: "ID", value: @resource["floating_ip"]["id"].to_s },
+                                { label: "Instance ID", value: @resource["floating_ip"]["instance_id"].to_s },
+                                { label: "Floating IP", value: @resource["floating_ip"]["ip"].to_s },
+                                { label: "Fixed IP", value: @resource["floating_ip"]["fixed_ip"].to_s },
+                                { label: "Pool", value: @resource["floating_ip"]["pool"].to_s },
                                ]
           @service.server_summary(nil, @columns_with_info)
         end

data/lib/chef/knife/openstack_floating_ip_associate.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 # Author:: Vasundhara Jagdale (<vasundhara.jagdale@clogeny.com>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
 
-require 'chef/knife/openstack_helpers'
-require 'chef/knife/cloud/openstack_service_options'
-require 'chef/knife/cloud/openstack_service'
-require 'chef/knife/cloud/command'
+require "chef/knife/openstack_helpers"
+require "chef/knife/cloud/openstack_service_options"
+require "chef/knife/cloud/openstack_service"
+require "chef/knife/cloud/command"
 
 class Chef
   class Knife
@@ -13,11 +14,11 @@ class Chef
         include OpenstackHelpers
         include OpenstackServiceOptions
 
-        banner 'knife openstack floating_ip associate IP (options)'
+        banner "knife openstack floating_ip associate IP (options)"
 
         option :instance_id,
-               long: '--instance-id ID',
-               description: 'Instance id to associate it with.',
+               long: "--instance-id ID",
+               description: "Instance id to associate it with.",
                proc: proc { |key| Chef::Config[:knife][:instance_id] = key },
                required: true
 
@@ -25,7 +26,7 @@ class Chef
           if @name_args[0]
             floating_ip = @name_args[0]
           else
-            ui.error 'Please provide Floating IP to associate with.'
+            ui.error "Please provide Floating IP to associate with."
             exit 1
           end
 

data/lib/chef/knife/openstack_floating_ip_disassociate.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 # Author:: Vasundhara Jagdale (<vasundhara.jagdale@clogeny.com>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
 
-require 'chef/knife/openstack_helpers'
-require 'chef/knife/cloud/openstack_service_options'
-require 'chef/knife/cloud/openstack_service'
-require 'chef/knife/cloud/command'
+require "chef/knife/openstack_helpers"
+require "chef/knife/cloud/openstack_service_options"
+require "chef/knife/cloud/openstack_service"
+require "chef/knife/cloud/command"
 
 class Chef
   class Knife
@@ -13,11 +14,11 @@ class Chef
         include OpenstackHelpers
         include OpenstackServiceOptions
 
-        banner 'knife openstack floating_ip disassociate IP (options)'
+        banner "knife openstack floating_ip disassociate IP (options)"
 
         option :instance_id,
-               long: '--instance-id ID',
-               description: 'Instance id to disassociate with.',
+               long: "--instance-id ID",
+               description: "Instance id to disassociate with.",
                proc: proc { |key| Chef::Config[:knife][:instance_id] = key },
                required: true
 
@@ -25,7 +26,7 @@ class Chef
           if @name_args[0]
             floating_ip = @name_args[0]
           else
-            ui.error 'Please provide Floating IP to disassociate.'
+            ui.error "Please provide Floating IP to disassociate."
             exit 1
           end
           instance_id = locate_config_value(:instance_id)