knife-softlayer 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjkxOWNhZWZkOGFlYTY3YjE2YWNlZTI5MjUwZjVjMGRiMzBiMjE4MA==
+    Y2Y2MzAzZmE2NWVlY2M0ODlmZmQwOTJjZDQwNjlmMGRhOTA2ZGMyMQ==
   data.tar.gz: !binary |-
-    ZTRkZGY2ZTJiNjllOTVjMDNlY2ZmODA3MzAwNWVjNjIzOGYzZjc1Zg==
+    YzU2NTA1Zjg4ZTM0NjZmYTBlNDQwMjliMmQwMDczZDkyNzg2MDU4Yg==
 SHA512:
   metadata.gz: !binary |-
-    ZTFhYzc2Yjc5MWIyMzFmYzVkNDNiM2I4MWZhYWZjNWU0ZmNmYzcyOTk3OWRi
-    NjY0YzdlZDQ4ZWVlOTg5YzBmZDJjMzQxODUzNjkyMGEwMGI5NGQzNzBhZGIy
-    NTJjZGQ4NTlmODNhYjVjZjUyYzUyYzAxZDIxOWZjYTI1NmViYWY=
+    MmMwN2MzMjhjYzk1MzYzN2Y0ZmM0YjQwODE2MTUyNjI3NTBiZTRhOWFkOWVl
+    Y2QxZTliMTdmMzM3OWRlODZmZTFjZTUyMDg1YjZhMzg3ODU0YTEwZGZjZmM5
+    OGQ2YjA1ZmJhNTM4ZjIwNzdmZDg2ZWJkNTU4ZGIxZjIyZWIzOTM=
   data.tar.gz: !binary |-
-    M2RjOTVlM2IxMmY4N2M4YWVhOGU3MjQ0OWVhNTBkZDI4Nzg0ZDQ0MmIzOGE5
-    ZjNmMmFiMTgwNTFlMWExMGM3YTI5ZGJhNjRmNGQzZWI3YTExMDcxYTZmOGI1
-    ZTI1YTk4YjNjNGU2NWI4YmYwMTM0OTAzMDkwMWU0NTExMjdiM2Y=
+    MjFjNGVlNGNiMjE2NjYzZjFkNmIxZWE4ODgxZWZkNDdiZWMzZTAwNTg1ZDU1
+    ZDkwNmM5ZmQwNDJiYmI2NGEyMmY5OGU3MzJhNzlmYmRlODE1MmQ5YzRiZmFl
+    ODg5ZDA3MzgwNjY1NTY1YTNhNGY4MjliMjM2ODQyZjQ0NWNkYjg=

data/examples/datacenter.md

@@ -0,0 +1,94 @@
+### Datacenter Examples
+
+These examples all assume you have set your SoftLayer username and api key in `~/.chef/knife.rb` like this:
+
+```ruby
+knife[:softlayer_username] = 'example_user'
+knife[:softlayer_api_key]  = '1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a'
+```
+  
+#### List all available datacenters
+
+```sh
+user@localhost> knife softlayer datacenter list
+ +-------+--------------+
+ | name  | long_name    |
+ +-------+--------------+
+ | ams01 | Amsterdam 1  |
+ +-------+--------------+
+ | wdc03 | Ashburn 3    |
+ +-------+--------------+
+ | dal01 | Dallas 1     |
+ +-------+--------------+
+ | dal02 | Dallas 2     |
+ +-------+--------------+
+ | dal04 | Dallas 4     |
+ +-------+--------------+
+ | dal05 | Dallas 5     |
+ +-------+--------------+
+ | dal06 | Dallas 6     |
+ +-------+--------------+
+ | dal07 | Dallas 7     |
+ +-------+--------------+
+ | hkg02 | Hong Kong 2  |
+ +-------+--------------+
+ | hou02 | Houston 2    |
+ +-------+--------------+
+ | lon02 | London 2     |
+ +-------+--------------+
+ | sjc01 | San Jose 1   |
+ +-------+--------------+
+ | sea01 | Seattle      |
+ +-------+--------------+
+ | sng01 | Singapore 1  |
+ +-------+--------------+
+ | tor01 | Toronto 1    |
+ +-------+--------------+
+ | wdc01 | Washington 1 |
+ +-------+--------------+
+
+```
+
+#### Show a particular datacenter
+```sh
+user@localhost> knife softlayer datacenter show tor01
+Long Name: Toronto 1
+Name: tor01
+Routers:
+  +--------------+--------+
+  | hostname     | id     |
+  +--------------+--------+
+  | bcr01a.tor01 | 266212 |
+  +--------------+--------+
+  | fcr01a.tor01 | 266412 |
+  +--------------+--------+
+  
+user@localhost> knife softlayer datacenter show wdc01
+Long Name: Washington 1
+Name: wdc01
+Routers:
+  +--------------+--------+
+  | hostname     | id     |
+  +--------------+--------+
+  | bcr01.wdc01  | 16358  |
+  +--------------+--------+
+  | bcr02.wdc01  | 40379  |
+  +--------------+--------+
+  | bcr03a.wdc01 | 85816  |
+  +--------------+--------+
+  | bcr04a.wdc01 | 180611 |
+  +--------------+--------+
+  | bcr05a.wdc01 | 235754 |
+  +--------------+--------+
+  | fcr01.wdc01  | 16357  |
+  +--------------+--------+
+  | fcr02.wdc01  | 40378  |
+  +--------------+--------+
+  | fcr03a.wdc01 | 85814  |
+  +--------------+--------+
+  | fcr04a.wdc01 | 180610 |
+  +--------------+--------+
+  | fcr05a.wdc01 | 235748 |
+  +--------------+--------+
+
+```

data/examples/flavor.md

@@ -0,0 +1,59 @@
+### Flavor examples
+
+These examples all assume you have set your SoftLayer username and api key in `~/.chef/knife.rb` like this:
+
+```ruby
+knife[:softlayer_username] = 'example_user'
+knife[:softlayer_api_key]  = '1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a'
+```
+  
+#### List available flavors
+
+```sh
+user@localhost> knife softlayer flavor list
+ +-----------+-----+-------+--------------------------------------------------+
+ | id        | cpu | ram   | disk                                             |
+ +-----------+-----+-------+--------------------------------------------------+
+ | m1.tiny   | 2   | 1024  | [{"device"=>0, "diskImage"=>{"capacity"=>25}}]   |
+ +-----------+-----+-------+--------------------------------------------------+
+ | m1.small  | 2   | 2048  | [{"device"=>0, "diskImage"=>{"capacity"=>100}}]  |
+ +-----------+-----+-------+--------------------------------------------------+
+ | m1.medium | 4   | 4096  | [{"device"=>0, "diskImage"=>{"capacity"=>500}}]  |
+ +-----------+-----+-------+--------------------------------------------------+
+ | m1.large  | 8   | 8192  | [{"device"=>0, "diskImage"=>{"capacity"=>750}}]  |
+ +-----------+-----+-------+--------------------------------------------------+
+ | m1.xlarge | 16  | 16384 | [{"device"=>0, "diskImage"=>{"capacity"=>1000}}] |
+ +-----------+-----+-------+--------------------------------------------------+
+NOTICE: 
+'flavors' provided here for convenience; SoftLayer allows you to choose a configuration a la carte.
+For a full list of available instance options use --all with the `knife softlayer flavor list` subcommand.
+```
+
+#### List available *a la carte* options
+
+```sh
+user@localhost> knife softlayer flavor list --all
+| CORES                       | RAM             | DISK             | OS                       | NETWORK [MBS]  | DATACENTER 
+| ==========                  | ==========      | ==========       | ==========               | ==========     | ========== 
+|  1 x 2.0 GHz Core           |  1024 [1 GB]    |  1,000 GB (SAN)  |  CENTOS_LATEST           |  10            |  ams01     
+|  2 x 2.0 GHz Cores          |  2048 [2 GB]    |  1,000 GB (SAN)  |  CENTOS_LATEST_64        |  100           |  dal01     
+|  4 x 2.0 GHz Cores          |  4096 [4 GB]    |  1,000 GB (SAN)  |  CENTOS_LATEST_32        |  1000          |  dal05     
+|  8 x 2.0 GHz Cores          |  6144 [6 GB]    |  1,000 GB (SAN)  |  CENTOS_6_64             |                |  dal06     
+|  12 x 2.0 GHz Cores         |  8192 [8 GB]    |  1,500 GB (SAN)  |  CENTOS_6_32             |                |  hkg02     
+|  16 x 2.0 GHz Cores         |  12288 [12 GB]  |  1,500 GB (SAN)  |  CENTOS_5_64             |                |  lon02     
+|  Private 1 x 2.0 GHz Core   |  16384 [16 GB]  |  1,500 GB (SAN)  |  CENTOS_5_32             |                |  sea01     
+|  Private 2 x 2.0 GHz Cores  |  32768 [32 GB]  |  1,500 GB (SAN)  |  CLOUDLINUX_LATEST       |                |  sjc01     
+|  Private 4 x 2.0 GHz Cores  |  49152 [48 GB]  |  10 GB (SAN)     |  CLOUDLINUX_LATEST_64    |                |  sng01     
+|  Private 8 x 2.0 GHz Cores  |  65536 [64 GB]  |  10 GB (SAN)     |  CLOUDLINUX_LATEST_32    |                |  tor01     
+|                             |                 |  10 GB (SAN)     |  CLOUDLINUX_6_64         |                |  wdc01     
+|                             |                 |  10 GB (SAN)     |  CLOUDLINUX_6_32         |                |            
+|                             |                 |  100 GB (LOCAL)  |  CLOUDLINUX_5_64         |                |            
+|                             |                 |  100 GB (LOCAL)  |  CLOUDLINUX_5_32         |                |            
+|                             |                 |  100 GB (SAN)    |  DEBIAN_LATEST           |                |            
+|                             |                 |  100 GB (SAN)    |  DEBIAN_LATEST_64        |                |            
+|                             |                 |  100 GB (SAN)    |  DEBIAN_LATEST_32        |                |            
+|                             |                 |  100 GB (SAN)    |  DEBIAN_7_64             |                |            
+|                             |                 |  100 GB (SAN)    |  DEBIAN_7_32             |                |            
+|                             |                 |  125 GB (SAN)    |  DEBIAN_6_64             |                |            
+# LIST HAS BEEN TRUNCATED FOR THIS EXAMPLE
+```

data/examples/global_ip.md

@@ -0,0 +1,23 @@
+### Global IP examples
+
+These examples all assume you have set your SoftLayer username and api key in `~/.chef/knife.rb` like this:
+
+```ruby
+knife[:softlayer_username] = 'example_user'
+knife[:softlayer_api_key]  = '1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a'
+```
+  
+#### List global ip addresses
+
+```sh
+user@localhost> knife softlayer global ip list
+ +-----------------+-----------------+
+ | address         | destination     |
+ +-----------------+-----------------+
+ | 108.168.254.93  | 173.192.218.117 |
+ +-----------------+-----------------+
+ | 108.168.254.96  | NOT ROUTED      |
+ +-----------------+-----------------+
+ | 108.168.254.168 | NOT ROUTED      |
+ +-----------------+-----------------+ 	
+```

data/examples/image.md

@@ -0,0 +1,35 @@
+### Server Image examples
+
+These examples all assume you have set your SoftLayer username and api key in `~/.chef/knife.rb` like this:
+
+```ruby
+knife[:softlayer_username] = 'example_user'
+knife[:softlayer_api_key]  = '1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a'
+```
+  
+#### List server images
+
+```sh
+user@localhost> knife softlayer image list
++--------------------------------------+--------+--------------------------------------------------------------------------------+
+| id                                   | access | name                                                                           |
++--------------------------------------+--------+--------------------------------------------------------------------------------+
+| 29073a7a-2fac-405c-b59f-4de8ad6e4945 | PRIVATE | My Golden Image                                                            |
++--------------------------------------+--------+--------------------------------------------------------------------------------+
+| ebb5664c-0471-41cb-bbdf-3de557fb8ed1 | PRIVATE | My Other Golden Image                                                            |
++--------------------------------------+--------+--------------------------------------------------------------------------------+
+| 1176d22b-176a-499a-8d94-f9aaf29155a3 | PUBLIC | 100G CentOS 5 64-bit                                                           |
++--------------------------------------+--------+--------------------------------------------------------------------------------+
+| 3d9be3bc-267a-4441-bb62-25a73fe62642 | PUBLIC | 100G CentOS 5 32-bit                                                           |
++--------------------------------------+--------+--------------------------------------------------------------------------------+
+| 54f4ed9f-f7e6-4fe6-8b54-3a7faacd82b3 | PUBLIC | 25G CentOS 6 64-bit                                                            |
++--------------------------------------+--------+--------------------------------------------------------------------------------+
+| ca668dc5-290d-4fdb-9427-deb9da797962 | PUBLIC | 25G CentOS 6 32-bit                                                            |
++--------------------------------------+--------+--------------------------------------------------------------------------------+
+| f0254ca6-14b5-44f3-84f8-ae5d3bedb77a | PUBLIC | 100G CentOS 6 32-bit                                                           |
++--------------------------------------+--------+--------------------------------------------------------------------------------+
+| c27eb0ad-bddd-44c7-a37a-e3ddbbfed277 | PUBLIC | 100G CentOS 6 64-bit                                                           |
++--------------------------------------+--------+--------------------------------------------------------------------------------+
+| cc30a0a6-b0f1-4db1-82d4-215977aba61d | PUBLIC | 25G RedHat 6 64-bit                                                            |
++--------------------------------------+--------+--------------------------------------------------------------------------------+
+```

data/examples/key_pair.md

@@ -0,0 +1,57 @@
+### Key Pair Examples
+
+These examples all assume you have set your SoftLayer username and api key in `~/.chef/knife.rb` like this:
+
+```ruby
+knife[:softlayer_username] = 'example_user'
+knife[:softlayer_api_key]  = '1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a'
+```
+  
+#### Create a Key Pair
+
+```sh
+user@localhost> knife softlayer key pair create
+Enter the label for this key pair: 
+```
+
+```sh
+user@localhost> knife softlayer key pair create
+Enter the label for this key pair: my-new-key-pair
+Enter path to the public key:
+```
+
+```sh
+user@localhost> knife softlayer key pair create
+Enter the label for this key pair: my-new-key-pair
+Enter path to the public key: /Users/user/.ssh/my_key_rsa.pub
+```
+
+```sh
+user@localhost> knife softlayer key pair create
+Enter the label for this key pair: my-new-key-pair
+Enter path to the public key: /Users/user/.ssh/my_key_rsa.pub
+Key pair successfully created.  Provisioning may take a few minutes to complete.
+Key pair ID is:  31246
+```
+
+
+
+  
+#### List Key Pairs
+
+```sh
+user@localhost> knife softlayer key pair list
++-------+------------------+---------------------------+-------------+
+| id    | label            | create_date               | modify_date |
++-------+------------------+---------------------------+-------------+
+| 30846 | Key1             | 2014-01-01T17:05:33-05:00 |             |
++-------+------------------+---------------------------+-------------+
+| 30946 | Key2             | 2014-02-24T11:36:43-05:00 |             |
++-------+------------------+---------------------------+-------------+
+| 31046 | Key3             | 2014-03-24T11:35:59-05:00 |             |
++-------+------------------+---------------------------+-------------+
+| 31146 | Key4             | 2014-04-10T14:48:35-05:00 |             |
++-------+------------------+---------------------------+-------------+
+| 31246 | my-new-key-pair  | 2014-05-29T11:53:17-05:00 |             |
++-------+------------------+---------------------------+-------------+
+```

data/examples/server.md

@@ -0,0 +1,81 @@
+### Server Examples
+
+These examples all assume you have set your SoftLayer username and api key in `~/.chef/knife.rb` like this:
+
+```ruby
+knife[:softlayer_username] = 'example_user'
+knife[:softlayer_api_key]  = '1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a'
+```
+  
+#### Create server and bootstrap as a chef node
+
+Create a server using an image, a flavor, assign an existing global ip address, and inject two ssh keys.
+
+```sh
+user@localhost> knife softlayer server create --image-id 23f7f05f-3657-4330-8772-329ed2e816bc --assign-global-ip 108.168.254.41 --ssh-keys 12345 23456 --hostname web --domain ibm.com --flavor m1.tiny --run-list 'recipe[redis],recipe[rbenv],recipe[apt]' -i /Users/user/.ssh/my_private_key_rsa  
+```
+
+Create a server, provision a new global ip address and assign it to the server, tag both the chef node and the SoftLayer server with the passed tags. 
+
+```sh
+user@localhost> knife softlayer server create --new-global-ip v4 --tags job=task,private=true --hostname web --domain ibm.com --flavor m1.tiny --run-list 'recipe[redis],recipe[rbenv],recipe[apt]' --ssh-keys 12345 -i /Users/user/.ssh/my_private_key_rsa
+```
+
+Create a server located in specific public and private VLANS.
+
+```sh
+user@localhost> knife softlayer server create --vlan 12345 --private-vlan 23456 --hostname web --domain ibm.com --flavor m1.tiny --run-list 'recipe[redis],recipe[rbenv],recipe[apt]' --ssh-keys 12345 -i /Users/user/.ssh/my_private_key_rsa --new-global-ip v4 --tags job=task,private=true
+```
+
+Create a server specifying options from a JSON file.
+
+```sh
+user@localhost> cat /Users/user/bootstrap.json
+{
+  "hostname": "web",
+  "domain": "ibm.com",
+  "flavor": "m1.xlarge",
+  "run-list": "recipe[redis],recipe[rbenv],recipe[apt]",
+  "ssh-keys": "73148",
+  "identity-file": "/Users/user/.ssh/my_softlayer_key_rsa",
+  "image-id": "23f7f05f-3657-4330-8772-329ed2e816bc"
+}
+
+user@localhost> knife softlayer server create --from-file /Users/user/bootstrap.json
+
+# options file + additional arguments
+user@localhost> knife softlayer server create --from-file /Users/user/bootstrap.json --tags job=task,private=true
+```
+
+Other options.
+
+```sh
+user@localhost> knife softlayer server create --help
+# There are a lot...
+```
+
+#### Destroy a server and its chef node and client
+
+Use the node name as an identifier.
+
+```sh
+user@localhost> knife softlayer server destroy --node-name some-node-name
+Decommissioning SoftLayer VM, this may take a few minutes.
+WARNING: Deleted node some-node-name
+Chef node successfully deleted.
+WARNING: Deleted client some-node-name
+Chef client successfully deleted.
+SoftLayer VM successfully deleted. You are no longer being billed for this instance.
+```
+
+Use the public ip address as an identifier 
+
+```sh
+user@localhost> knife softlayer server destroy --ip-address 33.33.33.33
+Decommissioning SoftLayer VM, this may take a few minutes.
+WARNING: Deleted node 5849421
+Chef node successfully deleted.
+WARNING: Deleted client 5849421
+Chef client successfully deleted.
+SoftLayer VM successfully deleted. You are no longer being billed for this instance.
+```

data/examples/vlan.md

@@ -0,0 +1,85 @@
+### VLAN examples
+
+These examples all assume you have set your SoftLayer username and api key in `~/.chef/knife.rb` like this:
+
+```ruby
+knife[:softlayer_username] = 'example_user'
+knife[:softlayer_api_key]  = '1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a'
+```
+  
+#### Create a new VLAN
+
+```sh
+user@localhost> knife softlayer vlan create
+Enter a vlan name:
+```
+
+```sh
+user@localhost> knife softlayer vlan create
+Enter a vlan name: my-new-vlan
+Enter a datacenter name: 
+```
+
+```sh
+user@localhost> knife softlayer vlan create
+Enter a vlan name: my-new-vlan
+Enter a datacenter name: wdc01
+Enter a router hostname: 
+```
+
+```sh
+user@localhost> knife softlayer vlan create
+Enter a vlan name: my-new-vlan
+Enter a datacenter name: wdc01
+Enter a router hostname: bcr05a.wdc01
+Enter a network space:[PUBLIC]
+```
+
+```sh
+user@localhost> knife softlayer vlan create
+Enter a vlan name: my-new-vlan
+Enter a datacenter name: wdc01
+Enter a router hostname: bcr05a.wdc01
+Enter a network space:[PUBLIC] PRIVATE # routers that start with bcr are for private VLANS; fcr are for public VLANS
+VLAN successfully created.  Provisioning may take a few minutes to complete.
+```
+
+#### List VLANS
+
+```sh
+user@localhost> knife softlayer vlan list
++--------+----------------------+--------------+---------------+--------------+
+| id     | name                 | datacenter   | network_space | router       |
++--------+----------------------+--------------+---------------+--------------+
+| 379384 | [none]               | Washington 1 | PUBLIC        | fcr02.wdc01  |
++--------+----------------------+--------------+---------------+--------------+
+| 379386 | [none]               | Washington 1 | PRIVATE       | bcr02.wdc01  |
++--------+----------------------+--------------+---------------+--------------+
+| 563298 | my-new-vlan          | Washington 1 | PRIVATE       | bcr02.wdc01  |
++--------+----------------------+--------------+---------------+--------------+
+| 339652 | [none]               | San Jose 1   | PUBLIC        | fcr01a.sjc01 |
++--------+----------------------+--------------+---------------+--------------+
+| 339654 | [none]               | San Jose 1   | PRIVATE       | bcr01a.sjc01 |
++--------+----------------------+--------------+---------------+--------------+
+| 557984 | [none]               | Dallas 5     | PUBLIC        | fcr02a.dal05 |
++--------+----------------------+--------------+---------------+--------------+
+| 557986 | [none]               | Dallas 5     | PRIVATE       | bcr02a.dal05 |
++--------+----------------------+--------------+---------------+--------------+
+```
+
+#### Show a particular VLAN
+
+```sh
+user@localhost> knife softlayer vlan show 563298
+ID: 563298
+Name: my-new-vlan
+Datacenter: wdc01
+Network Space: PRIVATE
+Router: bcr02.wdc01
+Subnets:
+  +--------+------+---------------+---------------+---------------+---------+------------+------------+
+  | id     | cidr | gateway_ip    | network_id    | broadcast     | type    | datacenter | ip_version |
+  +--------+------+---------------+---------------+---------------+---------+------------+------------+
+  | 572522 | 30   | 10.32.181.241 | 10.32.181.240 | 10.32.181.243 | PRIMARY | wdc01      | 4          |
+  +--------+------+---------------+---------------+---------------+---------+------------+------------+
+```

data/knife-softlayer.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Matt Eldridge"]
   spec.email         = ["matt.eldridge@us.ibm.com"]
   spec.summary       = %q{SoftLayer VM support for Chef's knife utility.}
-  spec.description   = spec.summary
+  spec.description   = IO.read('./README.md')
   spec.homepage      = "https://github.com/SoftLayer/knife-softlayer"
   spec.license       = "Apache 2.0"
 
@@ -25,12 +25,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(spec|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fog-softlayer", "~> 0.3.14"
-  spec.add_dependency "knife-windows", "> 0.5.12"
-  spec.add_dependency "net-ssh", "> 2.8.0"
+  spec.add_dependency "fog-softlayer", "~> 0.3", ">= 0.3.14"
+  spec.add_dependency "knife-windows", "~> 0.5", "> 0.5.12"
+  spec.add_dependency "net-ssh", "~> 2.8", "> 2.8.0"
 
   spec.add_development_dependency "mixlib-config", "~>2.0"
-  spec.add_development_dependency "chef", ">=0.10.10"
+  spec.add_development_dependency "chef", "~> 0.10", ">= 0.10.10"
   spec.add_development_dependency "rspec", "~>2.14"
   spec.add_development_dependency "rake", "~>10.1"
   spec.add_development_dependency "sdoc", "~>0.3"

data/lib/chef/knife/softlayer_global_ip_list.rb

@@ -13,7 +13,7 @@ class Chef
 
       include Knife::SoftlayerBase
 
-      banner 'knife softlayer global ips list (options)'
+      banner 'knife softlayer global ip list (options)'
 
       def run
         $stdout.sync = true

data/lib/chef/knife/softlayer_key_pair_create.rb

@@ -0,0 +1,37 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+require 'chef/knife/softlayer_base'
+
+class Chef
+  class Knife
+    class SoftlayerKeyPairCreate < Knife
+
+      include Knife::SoftlayerBase
+
+      banner 'knife softlayer key pair create'
+
+      def run
+        $stdout.sync = true
+        opts = {
+            :label => ui.ask_question("Enter the label for this key pair: "),
+            :key => ui.ask("Enter path to the public key: ", lambda{ |answer| IO.read(answer) })
+        }
+
+        key_pair = connection(:compute).key_pairs.create(opts)
+
+        if !!key_pair
+          puts "#{ui.color("Key pair successfully created.  Provisioning may take a few minutes to complete.", :green)}"
+          puts "#{ui.color("Key pair ID is: ", :green)} #{key_pair.id}"
+        else
+          puts "#{ui.color("Encountered a problem verifying key pair creation.  Please try again.", :yellow)}"
+        end
+      end
+
+    end
+  end
+end

data/lib/chef/knife/softlayer_key_pair_list.rb

@@ -0,0 +1,28 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+require 'chef/knife/softlayer_base'
+
+class Chef
+  class Knife
+    class SoftlayerKeyPairList < Knife
+
+      include Knife::SoftlayerBase
+
+      banner 'knife softlayer key pair list'
+
+      def run
+        $stdout.sync = true
+        table_data = connection(:compute).key_pairs.map do |kp|
+          {:id => kp.id, :label => kp.label,  :create_date => kp.create_date, :modify_date => kp.modify_date }
+        end
+        puts Formatador.display_table(table_data, [:id, :label, :create_date, :modify_date])
+      end
+
+    end
+  end
+end

data/lib/chef/knife/softlayer_vlan_create.rb

@@ -16,19 +16,14 @@ class Chef
       banner 'knife softlayer vlan create'
 
       def run
-        #unless name_args.size == 1
-        #  puts ui.color("Specify exactly one vlan to show.", :red)
-        #  show_usage
-        #  exit 1
-        #end
 
         $stdout.sync = true
 
         opts = {
-          :name => ui.ask_question("Enter a vlan name:"),
-          :datacenter => connection(:network).datacenters.by_name(ui.ask_question("Enter a datacenter name:")),
-          :router => {'hostname' => ui.ask_question("Enter a router hostname:")},
-          :network_space => ui.ask_question("Enter a network space:", :default => 'PUBLIC'),
+          :name => ui.ask_question("Enter a vlan name: "),
+          :datacenter => connection(:network).datacenters.by_name(ui.ask_question("Enter a datacenter name: ")),
+          :router => {'hostname' => ui.ask_question("Enter a router hostname: ")},
+          :network_space => ui.ask_question("Enter a network space: ", :default => 'PUBLIC'),
         }
 
         vlan = connection(:network).networks.create(opts)

data/lib/knife-softlayer/version.rb

@@ -7,6 +7,6 @@
 
 module Knife
   module Softlayer
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: knife-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Eldridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-softlayer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.14
   type: :runtime
@@ -22,12 +25,18 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.14
 - !ruby/object:Gem::Dependency
   name: knife-windows
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
     - - ! '>'
       - !ruby/object:Gem::Version
         version: 0.5.12
@@ -35,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
     - - ! '>'
       - !ruby/object:Gem::Version
         version: 0.5.12
@@ -42,6 +54,9 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
     - - ! '>'
       - !ruby/object:Gem::Version
         version: 2.8.0
@@ -49,6 +64,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
     - - ! '>'
       - !ruby/object:Gem::Version
         version: 2.8.0
@@ -70,6 +88,9 @@ dependencies:
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.10.10
@@ -77,6 +98,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.10.10
@@ -136,7 +160,35 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-description: SoftLayer VM support for Chef's knife utility.
+description: ! "# Knife::Softlayer\n[![Gem Version](https://badge.fury.io/rb/knife-softlayer.png)](http://badge.fury.io/rb/knife-softlayer)\n[![Build
+  Status](https://api.travis-ci.org/softlayer/knife-softlayer.svg)](https://travis-ci.org/softlayer/knife-softlayer)\n[![Dependency
+  Status](https://gemnasium.com/softlayer/knife-softlayer.svg)](https://gemnasium.com/softlayer/knife-softlayer)\n\nA
+  knife plugin for launching and bootstrapping instances in the IBM SoftLayer cloud.\n\n##
+  Installation\n\nAdd this line to your application's Gemfile:\n\n    gem 'knife-softlayer'\n\nAnd
+  then execute:\n\n    $ bundle\n\nOr install it yourself as:\n\n    $ gem install
+  knife-softlayer\n\n## Configuration\nAdd your SoftLayer username and API key to
+  your `knife.rb` file.\n\n```ruby\nlog_level                :info\nlog_location             STDOUT\nnode_name
+  \               'node'\nclient_key               '/path/to/key.pem'\nvalidation_client_name
+  \  'some-validator'\nvalidation_key           '/path/to/validator.pem'\nchef_server_url
+  \         'https://example.com/organizations/org'\nsyntax_check_cache_path  '/path/to/syntax_check_cache'\nknife[:softlayer_username]
+  = \"<SOFTLAYER USERNAME>\"\nknife[:softlayer_api_key]  = \"<SOFTLAYER API KEY>\"\n```\n\n##
+  Usage\n\nSee `knife softlayer --help` for more information.\n\nEXAMPLES:\n\n\n```bash\n#
+  look at some options\nuser@local> knife softlayer flavor list [--all]\n```\n\n```bash\n#
+  the minimum number of pieces of flare\nuser@local> knife softlayer server create
+  --hostname test --domain example.com --flavor tiny\n```\n\n```bash\n# being sort
+  of specific about things\nuser@local> knife softlayer server create -H test -D example.com
+  \\\n--block-storage 0:25,2:100,5:1000 \\ # device:GB, device:GB, ...\n--network-interface-speed
+  1000 \\\n--cores 8 \\\n--ram 49152 \\\n--os-code REDHAT_6_64 \\\n--datacenter ams01
+  \\\n--node-name random-node-name \\\n--assign-global-ip <existingGlobalIpv4Address>
+  \\\n--run-list 'recipe[apt],recipe[git],recipe[rbenv],recipe[memcached],recipe[redis]'\n```\n\n####
+  Legal stuff\nUse of this software requires runtime dependencies.  Those dependencies
+  and their respective software licenses are listed below.\n\n* [net-ssh](https://github.com/net-ssh/net-ssh/)
+  - LICENSE: [MIT](https://github.com/net-ssh/net-ssh/blob/master/LICENSE.txt)\n*
+  [softlayer_api](https://github.com/softlayer/softlayer-api-ruby-client) - LICENSE:
+  [MIT](https://github.com/softlayer/softlayer-api-ruby-client/blob/master/LICENSE.textile)\n*
+  [knife-windows](https://github.com/opscode/knife-windows) - LICENSE: [Apache v2](https://github.com/opscode/knife-windows/blob/master/LICENSE)\n\n\n--\n>
+  Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)\n>\n> © Copyright IBM Corporation
+  2014.\n>\n> LICENSE: Apache 2.0 (http://www.apache.org/licenses/)\n\n"
 email:
 - matt.eldridge@us.ibm.com
 executables: []
@@ -153,6 +205,13 @@ files:
 - Rakefile
 - docs/cla-corporate.md
 - docs/cla-individual.md
+- examples/datacenter.md
+- examples/flavor.md
+- examples/global_ip.md
+- examples/image.md
+- examples/key_pair.md
+- examples/server.md
+- examples/vlan.md
 - knife-softlayer.gemspec
 - lib/chef/knife/flavor/base.rb
 - lib/chef/knife/softlayer.rb
@@ -163,6 +222,8 @@ files:
 - lib/chef/knife/softlayer_flavor_list.rb
 - lib/chef/knife/softlayer_global_ip_list.rb
 - lib/chef/knife/softlayer_image_list.rb
+- lib/chef/knife/softlayer_key_pair_create.rb
+- lib/chef/knife/softlayer_key_pair_list.rb
 - lib/chef/knife/softlayer_list.rb
 - lib/chef/knife/softlayer_server_create.rb
 - lib/chef/knife/softlayer_server_destroy.rb