knife-rackspace 0.11.1 → 1.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODQzY2Q3NmUyODY1YmQ0OTUyN2Q5NjI1N2I3MTBmMDYxOGVkY2Y5MQ==
-  data.tar.gz: !binary |-
-    MjY0YmQ3N2VhYTA4MjZiNmI1ZDAyZDJjMzMwMzQyYzI3ODdkZDcyOQ==
+SHA1:
+  metadata.gz: 967c80d89cf4bd3ce780e24b678aaf50324c52f6
+  data.tar.gz: 68897241bb46bd04c1f61e9ed40b9ea002997a8e
 SHA512:
-  metadata.gz: !binary |-
-    YTJlMjM3ZThmZWJhYjQ3NTlkYjYzZGJjZjQ2YTQ4ZmQ2ZTMyYjZhMTU4N2Ux
-    NmZmOTIxMjhkYzNjYjM2ZDJmZjZjZGYyY2M2NTk4NDliM2QxMTY2ODRiYTQ1
-    YTExNmFhNGI5NzI2NTQ2NDhlMThlNjgxMWIzYTdlNTIzMGRmMDY=
-  data.tar.gz: !binary |-
-    NGJiY2NiOTNiN2QzOGUxNmRkN2RlYjA0MTVmZGJmOWQ2NzA1ODBmZTEwNWI2
-    NDliY2I2ODRlMGE5NWM3OGFlZGY4ZDZjZjNhOWNiMjdmMDMyNDI3ZTRmZjhk
-    NWYzMDMyNDYwZDc1MWFiMDkwMjI2ZjgyMjJlNTczMDJkMDVmYzI=
+  metadata.gz: aeaed772b104df0db30785c4ca82f3ff121bb3e311201bc48de2c3b6f8df21b1f1784278a14e2895796acb4a68fcb6cd48a3951135ca5c75735b1278e233ffd3
+  data.tar.gz: f2501f2c1f7d29e6f3778d58145f2768bb6b6a9a355a0e49a778ae2573cb8ee07838587536ad42268bea2d9392563ce013fd6206d28142cb2c59701f3f4508fc

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,21 @@
+# Version:
+
+[Version of the project installed]
+
+# Environment: [Details about the environment such as the Operating System, cookbook details, etc...]
+
+# Scenario:
+
+[What you are trying to achieve and you can't?]
+
+# Steps to Reproduce:
+
+[If you are filing an issue what are the things we need to do in order to repro your problem?]
+
+# Expected Result:
+
+[What are you expecting to happen as the consequence of above reproduction steps?]
+
+# Actual Result:
+
+[What actually happens after the reproduction steps?]

data/.travis.yml

@@ -1,9 +1,9 @@
-sudo: false
 language: ruby
+cache: bundler
+sudo: false
 rvm:
-  - 2.2
-  - 2.1
-  - 2.0.0
+- 2.2.5
+- 2.3.1
 env:
   global:
     - excon_debug: true

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## v1.0.0
+* Use fog/rackspace instead of fog gem
+* Require Ruby 2.2.2 / Chef 12 and general cleanup
+* Spec updates to avoid deprecation warnings
+* Chefstyle fixes
+* Modified server list - #118
+
+## v0.11.1
+* Remove unused, and unsupported/ancient knife-dsl requirement
+* Take it all the way to 11 (Chef 11.x) and greater
+
 ## v0.11.0
 * Add -B (boot volume ID) to `knife rackspace server create` - #91
 

data/Gemfile

@@ -1,3 +1,10 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
+# Specify your gem's dependencies in knife-rackspace.gemspec
 gemspec
+
+gem "rspec", "~> 3.0"
+gem "vcr"
+gem "ansi"
+gem "chefstyle"
+gem "rake", "~> 11.0"

data/README.md

@@ -0,0 +1,230 @@
+# Knife Rackspace
+
+[![Gem Version](https://badge.fury.io/rb/knife-rackspace.svg)](https://rubygems.org/gems/knife-rackspace) [![Build Status](https://travis-ci.org/chef/knife-rackspace.svg?branch=master)](https://travis-ci.org/chef/knife-rackspace)
+
+This is the official Chef Knife plugin for Rackspace Cloud Servers. This plugin gives knife the ability to create, bootstrap, and manage servers on all the regions for Rackspace Cloud Servers.
+
+## Requirements
+
+- Chef 12.0 higher
+- Ruby 2.2.2 or higher
+
+## Installation
+
+Using [ChefDK](https://downloads.chef.io/chef-dk/), simply install the Gem:
+
+```bash
+chef gem install knife-rackspace
+```
+
+## Configuration
+
+In order to communicate with the Rackspace Cloud API you will have to tell Knife about your Username and API Key. The easiest way to accomplish this is to create some entries in your knife.rb file:
+
+```ruby
+knife[:rackspace_api_username] = "Your Rackspace API username"
+knife[:rackspace_api_key] = "Your Rackspace API Key"
+```
+
+If your knife.rb file will be checked into a SCM system (ie readable by others) you may want to read the values from environment variables:
+
+```ruby
+knife[:rackspace_api_username] = "#{ENV['RACKSPACE_USERNAME']}"
+knife[:rackspace_api_key] = "#{ENV['RACKSPACE_API_KEY']}"
+```
+
+You also have the option of passing your Rackspace API Username/Key into the individual knife subcommands using the **-A** (or **--rackspace-api-username**) **-K** (or **--rackspace-api-key**) command options
+
+```
+# provision a new 1GB Ubuntu 10.04 webserver
+knife rackspace server create -I 112 -f 3 -A 'Your Rackspace API username' -K "Your Rackspace API Key" -r 'role[webserver]'
+```
+
+To select for the previous Rackspace API (aka 'v1'), you can use the **--rackspace-version v1** command option. 'v2' is the default, so if you're still using exclusively 'v1' you will probably want to add the following to your knife.rb:
+
+```ruby
+knife[:rackspace_version] = 'v1'
+```
+
+This plugin also has support for authenticating against an alternate API Auth URL. This is useful if you are a using a custom endpoint, here is an example of configuring your knife.rb:
+
+```ruby
+knife[:rackspace_auth_url] = "auth.my-custom-endpoint.com"
+```
+
+Different regions can be specified by using the `--rackspace-region` switch or using the `knife[:rackspace_region]` in the knife.rb file. Valid regions include :dfw, :ord, :lon, and :syd.
+
+If you are behind a proxy you can specify it in the knife.rb file as follows:
+
+```ruby
+https_proxy https://PROXY_IP_ADDRESS:PORT
+```
+
+SSL certificate verification can be disabled by include the following in your knife.rb file:
+
+```ruby
+knife[:ssl_verify_peer] = false
+```
+
+Additionally the following options may be set in your knife.rb:
+
+- flavor
+- image
+- distro
+- template_file
+
+## Knife Sub Commands
+
+This plugin provides the following Knife subcommands. Specific command options can be found by invoking the subcommand with a --help flag
+
+### knife rackspace server create
+
+Provisions a new server in the Rackspace Cloud and then perform a Chef bootstrap (using the SSH protocol). The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists (provided by the provisioning). It is primarily intended for Chef Client systems that talk to a Chef server. By default the server is bootstrapped using the {chef-full}[<https://github.com/opscode/chef/blob/master/chef/lib/chef/knife/bootstrap/chef-full.erb>] template. This can be overridden using the **-d** or **--template-file** command options.
+
+If no name is provided, nodes created with the v1 API are named after their instance ID, with the v2 API they are given a random 'rs-XXXXXXXXX' name.
+
+Files can be injected onto the provisioned system using the **--file** switch. For example to inject my_script.sh into **/root/initialize.sh** you would use the following switch: **--file /root/initialize.sh=my_script.sh**
+
+Note: You can only inject text files and the maximum destination path is 255 characters.
+
+You may specify if want to manage your disk partitioning scheme with the **--rackspace-disk-config DISKCONFIG** option. If you bootstrap a `v2` node and leave this set to the default "AUTO", larger nodes take longer to bootstrap as it grows the disk from 10G to fill the full amount of local disk provided. This option allows you to pass "MANUAL" - which give you a node (in 1/2 to 1/4 of the time) and lets you manage ignoring, or formatting the rest of the disk on your own.
+
+<http://docs.openstack.org/essex/openstack-compute/starter/content/Launch_and_manage_instances-d1e1885.html>
+
+You may specify a custom network using the **--network [LABEL_OR_ID]** option. You can also remove the default internal ServiceNet and PublicNet networks by specifying the **--no-default-networks** switch. To use a network other than PublicNet for the bootstrap connection, specify the **--bootstrap-network LABEL** option.
+
+Note: If you are using one of the `performanceX-X` machines, you need to put **-f** or **--flavor** in quotes.
+
+#### Windows
+
+Windows Servers require special treatment with the knife-rackspace gem.
+
+First, you'll need to ensure you've installed the knife-windows gem. Installation instructions can be found over here: <http://docs.chef.io/plugin_knife_windows.html#install-this-plugin>
+
+Secondly, you need to make sure that the image you're using has WinRM pre-configured. Unfortunately, none of the Rackspace Windows image have this done by default, so you'll need to run the following instructions in a Windows machine, then save a Snapshot to use when creating servers with knife rackspace: <http://docs.chef.io/plugin_knife_windows.html#requirements>
+
+Thirdly, you must pass **--bootstrap-protocol winrm** and **--distro windows-chef-client-msi** parameters to the knife rackspace create command
+
+If you have troubles, make sure you add the **-VV** switch for extra verbosity. The **--server-create-timeout** switch may also be your friend, as Windows machines take a long time to build compared to Linux ones.
+
+### knife rackspace server delete
+
+Deletes an existing server in the currently configured Rackspace Cloud account by the server/instance id. You can find the instance id by entering **knife rackspace server list**. Please note - this does not delete the associated node and client objects from the Chef server unless you pass the **-P** or **--purge** command option. Using the **--purge** option with v2 nodes will attempt to delete the node and client by the name of the node.
+
+### knife rackspace server list
+
+Outputs a list of all servers in the currently configured Rackspace Cloud account. Please note - this shows all instances associated with the account, some of which may not be currently managed by the Chef server. You may need to use the **--rackspace-version** and **--rackspace-region** options to see nodes in different Rackspace regions.
+
+### knife rackspace flavor list
+
+Outputs a list of all available flavors (available hardware configuration for a server) available to the currently configured Rackspace Cloud account. Each flavor has a unique combination of disk space, memory capacity and priority for CPU time. This data can be useful when choosing a flavor id to pass to the **knife rackspace server create** subcommand. You may need to use the **--rackspace-version** and **--rackspace-region** options to see nodes in different Rackspace regions.
+
+### knife rackspace image list
+
+Outputs a list of all available images available to the currently configured Rackspace Cloud account. An image is a collection of files used to create or rebuild a server. Rackspace provides a number of pre-built OS images by default. This data can be useful when choosing an image id to pass to the **knife rackspace server create** subcommand. You may need to use the **--rackspace-version** and **--rackspace-region** options to see nodes in different Rackspace regions.
+
+### knife rackspace network list
+
+Outputs a list of available networks to the currently configured Rackspace Cloud account. Networks can be added at a server during the creation process using the **--network [LABEL_OR_ID]** option. Knife does not currently support adding a network to an existing server.
+
+### knife rackspace network create
+
+Creates a new cloud network. Both the label and the CIDR are required parameters which are specified using the **--label LABEL** and **--cidr CIDR**
+
+respectively. The CIDR should be in the form of 172.16.0.0/24 or 2001:DB8::/64\. Refer to <http://www.rackspace.com/knowledge_center/article/using-cidr-notation-in-cloud-networks> for more information.
+
+### knife rackspace network delete
+
+Deletes one or more specified networks by id. The network must be detached from all hosts before it is deleted.
+
+### Knife & Rackspace Rackconnect
+
+Rackspace Rackconnect allows the creation of a hybrid setup where you can have Cloud servers which are connected to bare metal hardware like Firewalls and Load balancers. You can read more about this product at <http://www.rackspace.com/cloud/hybrid/rackconnect/>
+
+Under the hood, this changes the behavior of how the cloud servers are configured and how IP addresses are assigned to them. So when using knife-rackspace with a 'Rack connected' cloud account you need use some additional parameters. See the sections below for more information regarding the two versions of Rack Connect.
+
+Note: If you account is leveraging private cloud networks for Rackconnnect then you are using Rackconnect v3\. You can also find your version of Rackconnect by checking with your support team
+
+#### Knife and Rackconnect version 2
+
+```
+knife rackspace server create  \
+--server-name <name of the server> \
+--image <Rackspace image id> \
+--flavor <Rackspace flavor id> \
+-r 'role[base]' \
+--rackconnect-wait
+```
+
+Note: If the server is also part of Rackspace Managed Operations service level you will need to add the
+
+**--rackspace-servicelevel-wait** option.
+
+```
+knife rackspace server create  \
+--server-name <name of the server> \
+--image <Rackspace image id> \
+--flavor <Rackspace flavor id> \
+-r 'role[base]' \
+--rackconnect-wait \
+--rackspace-servicelevel-wait
+```
+
+**--rackconnect-wait** does the following:
+
+- Rackconnect version 2 changes the networking on the cloud server and forces all trafic to route via the dedicated firewall or load balancer. It also then assigns the cloud server a new public IP address. The status of this automation provided by updates to the cloud server metadata. This option makes Knife wait for the Rackconnect automation to complete by checking the metadata.
+
+- Once the status is updated, it triggers the bootstrap process.
+
+**--rackspace-servicelevel-wait** does the following:
+
+- For Cloud servers in the Managed operations service level, Rackspace installs additional agents and software which enables them to provide support. This automation. like the Rackconnect one, updates the cloud server metadata of its status. Likewise, using this option, makes knife wait till the automation is complete before triggering the bootstrap process.
+
+#### Knife and Rackconnect version 3
+
+In case of version 3, there is a different command line option.
+
+```
+knife rackspace server create \
+--server-name <name of the server> \
+--image <Rackspace image id> \
+--flavor <Rackspace flavor id> \
+-r 'role[base]' \
+--rackconnect-v3-network-id <cloud network id>
+```
+
+**--rackconnect-v3-network-id** does the following :-
+
+- Create the server with the corresponding cloud network. The network id the id of an existing cloud network.
+- Knife will then issue additional API calls to the Rackconnect API to assign a new public IP to the cloud server. The new IP is also stored in the Cloud Server Metadata under accessv4IP.
+- Knife then waits for the IP to be provisioned before triggering the bootstrap process.
+
+Functionally, this operates the same way as version 2\. However, behind the scenes, Rackconnect v3 is significantly different in implementation. You can learn about the differences here : <http://www.rackspace.com/knowledge_center/article/comparing-rackconnect-v30-and-rackconnect-v20>
+
+## Contributing
+
+For information on contributing to this project see <https://github.com/chef/chef/blob/master/CONTRIBUTING.md>
+
+## License and Authors
+
+```text
+Author:: Adam Jacob (<adam@chef.io>)
+Author:: Seth Chisamore (<schisamo@chef.io>)
+Author:: Matt Ray (<matt@chef.io>)
+Author:: JJ Asghar (<jj@chef.io>)
+Author:: Rackspace Developers
+Copyright:: Copyright (c) 2019-2016 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.
+```

data/Rakefile

@@ -1,7 +1,7 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2008, 2010 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,35 +17,35 @@
 # limitations under the License.
 #
 
-require 'bundler'
+require "bundler"
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
-task :default => [:credentials, :spec, 'integration:live']
+task :default => [:credentials, :spec, "integration:live"]
 
 task :credentials do
-  if ENV['TRAVIS_SECURE_ENV_VARS'] == 'false'
+  if ENV["TRAVIS_SECURE_ENV_VARS"] == "false"
     puts "Setting vars"
-    ENV['OS_USERNAME'] = '_RAX_USERNAME_'
-    ENV['OS_PASSWORD'] = '_RAX_PASSWORD_'
-    ENV['RS_TENANT_ID'] = '000000'
-    ENV['RS_CDN_TENANT_NAME'] = '_CDN-TENANT-NAME_'
+    ENV["OS_USERNAME"] = "_RAX_USERNAME_"
+    ENV["OS_PASSWORD"] = "_RAX_PASSWORD_"
+    ENV["RS_TENANT_ID"] = "000000"
+    ENV["RS_CDN_TENANT_NAME"] = "_CDN-TENANT-NAME_"
   end
-  fail "Not all required variables detected" unless ENV['OS_USERNAME'] && ENV['OS_PASSWORD'] && ENV['RS_CDN_TENANT_NAME'] && ENV['RS_TENANT_ID']
+  raise "Not all required variables detected" unless ENV["OS_USERNAME"] && ENV["OS_PASSWORD"] && ENV["RS_CDN_TENANT_NAME"] && ENV["RS_TENANT_ID"]
 end
 
 namespace :integration do
-  desc 'Run the integration tests'
+  desc "Run the integration tests"
   RSpec::Core::RakeTask.new(:test) do |t|
-    t.pattern = 'spec/integration/**'
+    t.pattern = "spec/integration/**"
   end
 
-  desc 'Run the integration tests live (no VCR cassettes)'
+  desc "Run the integration tests live (no VCR cassettes)"
   task :live do
-    unless ENV['TRAVIS'] == 'true' && ENV['TRAVIS_SECURE_ENV_VARS'] == 'false'
-      ENV['INTEGRATION_TESTS'] = 'live'
-      Rake::Task['integration:test'].invoke
+    unless ENV["TRAVIS"] == "true" && ENV["TRAVIS_SECURE_ENV_VARS"] == "false"
+      ENV["INTEGRATION_TESTS"] = "live"
+      Rake::Task["integration:test"].invoke
     end
   end
 end

data/knife-rackspace.gemspec

@@ -6,23 +6,19 @@ Gem::Specification.new do |s|
   s.name        = "knife-rackspace"
   s.version     = Knife::Rackspace::VERSION
   s.has_rdoc = true
-  s.authors     = ["Adam Jacob","Seth Chisamore", "Matt Ray","Rackspace Developers","JJ Asghar"]
-  s.email       = ["adam@chef.io","schisamo@chef.io", "matt@chef.io","jj@chef.io"]
+  s.authors     = ["Adam Jacob", "Seth Chisamore", "Matt Ray", "Rackspace Developers", "JJ Asghar"]
+  s.email       = ["adam@chef.io", "schisamo@chef.io", "matt@chef.io", "jj@chef.io"]
   s.homepage = "https://github.com/chef/knife-rackspace"
   s.summary = "Rackspace Support for Chef's Knife Command"
   s.description = s.summary
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
+  s.extra_rdoc_files = ["README.md", "LICENSE" ]
 
+  s.required_ruby_version = ">= 2.2.2"
   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.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.add_dependency "knife-windows"
-  s.add_dependency "fog", '>= 1.35'
-  s.add_dependency "chef", ">= 11.0.0"
+  s.add_dependency "fog-rackspace", ">= 0.1"
+  s.add_dependency "chef", ">= 12.0"
   s.require_paths = ["lib"]
-
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "vcr"
-  s.add_development_dependency "ansi"
-  s.add_development_dependency "rake"
 end

data/lib/chef/knife/rackspace_base.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011-2013 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
-require 'fog'
+require "chef/knife"
+require "fog/rackspace"
 
 class Chef
   class Knife
@@ -30,10 +30,10 @@ class Chef
         includer.class_eval do
 
           deps do
-            require 'fog'
-            require 'net/ssh/multi'
-            require 'readline'
-            require 'chef/json_compat'
+            require "fog/rackspace"
+            require "net/ssh/multi"
+            require "readline"
+            require "chef/json_compat"
           end
 
           option :rackspace_api_key,
@@ -49,8 +49,8 @@ class Chef
             :proc => Proc.new { |username| Chef::Config[:knife][:rackspace_username] = username }
 
           option :rackspace_version,
-            :long => '--rackspace-version VERSION',
-            :description => 'Rackspace Cloud Servers API version',
+            :long => "--rackspace-version VERSION",
+            :description => "Rackspace Cloud Servers API version",
             :default => "v2",
             :proc => Proc.new { |version| Chef::Config[:knife][:rackspace_version] = version }
 
@@ -65,8 +65,8 @@ class Chef
             :proc => Proc.new { |region| Chef::Config[:knife][:rackspace_region] = region }
 
           option :file,
-            :long => '--file DESTINATION-PATH=SOURCE-PATH',
-            :description => 'File to inject on node',
+            :long => "--file DESTINATION-PATH=SOURCE-PATH",
+            :description => "File to inject on node",
             :proc => Proc.new {|arg|
               Chef::Config[:knife][:file] ||= []
               Chef::Config[:knife][:file] << arg
@@ -94,14 +94,14 @@ class Chef
           region_warning_for_v1
           @connection ||= begin
             connection = Fog::Compute.new(connection_params({
-              :version => 'v1'
+              :version => "v1",
               }))
           end
         else
           Chef::Log.debug("rackspace v2")
           @connection ||= begin
             connection = Fog::Compute.new(connection_params({
-              :version => 'v2'
+              :version => "v2",
             }))
           end
         end
@@ -113,13 +113,13 @@ class Chef
         end
       end
 
-      def connection_params(options={})
+      def connection_params(options = {})
         unless locate_config_value(:rackspace_region)
           ui.error "Please specify region via the command line using the --rackspace-region switch or add a knife[:rackspace_region] = REGION to your knife file."
           exit 1
         end
 
-        username =  locate_config_value(:rackspace_username) || locate_config_value(:rackspace_api_username)
+        username = locate_config_value(:rackspace_username) || locate_config_value(:rackspace_api_username)
         unless username
           ui.error "Please specify an api username via the command line using the --rackspace-username switch or add a knife[:rackspace_username] = USERNAME to your knife file."
           exit 1
@@ -131,18 +131,18 @@ class Chef
         end
 
         hash = options.merge({
-          :provider => 'Rackspace',
+          :provider => "Rackspace",
           :rackspace_api_key => locate_config_value(:rackspace_api_key),
           :rackspace_username => username,
           :rackspace_auth_url => auth_endpoint,
-          :rackspace_region => locate_config_value(:rackspace_region)
+          :rackspace_region => locate_config_value(:rackspace_region),
         })
 
         hash[:connection_options] ||= {}
         Chef::Log.debug("https_proxy #{ Chef::Config[:https_proxy] || "<not specified>"} (config)")
         Chef::Log.debug("http_proxy #{ Chef::Config[:http_proxy] || "<not specified>"} (config)")
         if Chef::Config.has_key?(:https_proxy) || Chef::Config.has_key?(:http_proxy)
-          hash[:connection_options] = {:proxy => Chef::Config[:https_proxy] || Chef::Config[:http_proxy] }
+          hash[:connection_options] = { :proxy => Chef::Config[:https_proxy] || Chef::Config[:http_proxy] }
         end
         Chef::Log.debug("using proxy #{hash[:connection_options][:proxy] || "<none>"} (config)")
         Chef::Log.debug("ssl_verify_peer #{Chef::Config[:knife].has_key?(:ssl_verify_peer) ? Chef::Config[:knife][:ssl_verify_peer] : "<not specified>"} (config)")
@@ -154,7 +154,7 @@ class Chef
       def auth_endpoint
         url = locate_config_value(:rackspace_auth_url)
         return url if url
-        (locate_config_value(:rackspace_region) == 'lon') ? ::Fog::Rackspace::UK_AUTH_ENDPOINT : ::Fog::Rackspace::US_AUTH_ENDPOINT
+        (locate_config_value(:rackspace_region) == "lon") ? ::Fog::Rackspace::UK_AUTH_ENDPOINT : ::Fog::Rackspace::US_AUTH_ENDPOINT
       end
 
       def locate_config_value(key)
@@ -162,21 +162,21 @@ class Chef
         Chef::Config[:knife][key] || config[key]
       end
 
-      def msg_pair(label, value, color=:cyan)
+      def msg_pair(label, value, color = :cyan)
         if value && !value.to_s.empty?
           puts "#{ui.color(label, color)}: #{value}"
         end
       end
 
-      def ip_address(server, network='public')
+      def ip_address(server, network = "public")
         if version_one?
           case network
-          when 'public'; v1_public_ip(server)
-          when 'private'; v1_private_ip(server)
+          when "public" then v1_public_ip(server)
+          when "private" then v1_private_ip(server)
           else raise NotImplementedError
           end
         else
-          if network == 'public' && v2_access_ip(server) != ""
+          if network == "public" && v2_access_ip(server) != ""
             v2_access_ip(server)
           else
             v2_ip_address(server, network)
@@ -185,7 +185,7 @@ class Chef
       end
 
       def public_dns_name(server)
-        if public_ip_address = ip_address(server, 'public')
+        if public_ip_address = ip_address(server, "public")
           @public_dns_name ||= begin
             Resolv.getname(public_ip_address)
           rescue
@@ -197,11 +197,11 @@ class Chef
       private
 
       def version_one?
-        rackspace_api_version == 'v1'
+        rackspace_api_version == "v1"
       end
 
       def rackspace_api_version
-        version = locate_config_value(:rackspace_version) || 'v2'
+        version = locate_config_value(:rackspace_version) || "v2"
         version.downcase
       end
 

data/lib/chef/knife/rackspace_flavor_list.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011-2012 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/knife/rackspace_base'
+require "chef/knife/rackspace_base"
 
 class Chef
   class Knife
@@ -29,32 +29,32 @@ class Chef
       def run
         if version_one?
           flavor_list = [
-            ui.color('ID', :bold),
-            ui.color('Name', :bold),
-            ui.color('Architecture', :bold),
-            ui.color('RAM', :bold),
-            ui.color('Disk', :bold)
+            ui.color("ID", :bold),
+            ui.color("Name", :bold),
+            ui.color("Architecture", :bold),
+            ui.color("RAM", :bold),
+            ui.color("Disk", :bold),
           ]
         else
           flavor_list = [
-            ui.color('ID', :bold),
-            ui.color('Name', :bold),
-            ui.color('VCPUs', :bold),
-            ui.color('RAM', :bold),
-            ui.color('Disk', :bold)
+            ui.color("ID", :bold),
+            ui.color("Name", :bold),
+            ui.color("VCPUs", :bold),
+            ui.color("RAM", :bold),
+            ui.color("Disk", :bold),
           ]
         end
         connection.flavors.sort_by(&:id).each do |flavor|
-          bits = flavor.respond_to?(:bits) ? "#{flavor.bits.to_s}-bit" : ""
+          bits = flavor.respond_to?(:bits) ? "#{flavor.bits}-bit" : ""
 
           flavor_list << flavor.id.to_s
           flavor_list << flavor.name
           flavor_list << bits if version_one?
           flavor_list << flavor.vcpus.to_s unless version_one?
-          flavor_list << "#{flavor.ram.to_s}"
-          flavor_list << "#{flavor.disk.to_s} GB"
+          flavor_list << "#{flavor.ram}"
+          flavor_list << "#{flavor.disk} GB"
         end
-          puts ui.list(flavor_list, :uneven_columns_across, 5)
+        puts ui.list(flavor_list, :uneven_columns_across, 5)
       end
     end
   end