knife-brightbox 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGI4N2JhNzFjYThjNDY3NjY4YTQxOGQ1NDQyNTVhYTljMDFhN2ZjYw==
-  data.tar.gz: !binary |-
-    YTA5YzM3NjA2MWRlMDNiZTIyYWEwOGEyZTI4YWY4N2ZjNDk2NTc5Yw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZTNlMzlkZjU2ZThjMDY1MjdmZDIzNjMwNzAzMzI5YjU5YWE2ZTMwOTAzYjYz
-    OTUzMmUwOTI5Y2Q0ZmYyMGQwZGU2MTU1ZDU2MjlmMmFmYWNjMTc1ZmI5NTdj
-    ODkzMGUxYTE4NTZlMjZlMTc4Nzg2NDY4YjA5MTk3NTc4NjE2YWY=
-  data.tar.gz: !binary |-
-    NjlkZDc1YTY1MTBkMTkxZTg0NzU3NDBmNTU5YTA2ODBhZmE3NjQ2YTFjZjEz
-    YWQyYWE3YTQ2NmRkNjNiZWYxZTE2OTE4ZTc2NWZkZWMzODcwNWE4ZmFhN2M4
-    ZDY0ZmRjZjQ0ODZiMmEwNTExYjgwNGI5MzQ2ZTY4MjQyM2I0ZDY=
+SHA1:
+  metadata.gz: 232a756d01ba131c96ac44c15575521523e7f7cb
+  data.tar.gz: 913a7023ea765ebef0cad9d0bc5b21190ee73f7b
+SHA512:
+  metadata.gz: 78fd3404057b71b523968e653dce4f7b0051bf639cc1a88a3fd393513ffef022e7bfb020e3c19cc29d8e1095becd35d7231f2e2a1ff46bca4e8ce3ba9706e66c
+  data.tar.gz: 686537e040010dd23140b063bf0bbfda1949b08281e7681e8d2f580bb687d87beee5a50b5de6c635aa93260c70097f25b5e775c16312c28f70d62b8cae32f29c

data/CHANGELOG

@@ -1,3 +1,10 @@
+# 0.4.0
+
+* Introduces support for Zones.
+* Can list zones using `knife brightbox zone list`
+* Can specify zone to create server in with `--zone` argument using handle
+  (gb1-a)
+
 # 0.3.0
 
 * introducing `--purge` and `--node-name` command line options for the

data/README.rdoc

@@ -24,6 +24,11 @@ This plugin is distributed as a Ruby Gem. To install it, run:
 
 Depending on your system's configuration, you may need to run this command with root privileges.
 
+If you're using Bundler, add this to your Gemfile and run `bundle install`:
+
+   gem 'knife-brightbox'
+
+
 = CONFIGURATION:
 
 In order to communicate with the Brightbox 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 <tt>knife.rb</tt> file:
@@ -51,6 +56,7 @@ Additionally the following options may be set in your `knife.rb`:
 * image
 * distro
 * template_file
+* zone (gb1-a or gb1-b)
 
 = SUBCOMMANDS:
 
@@ -60,6 +66,8 @@ This plugin provides the following Knife subcommands.  Specific command options
 
 Provisions a new server in the Brightbox 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 {ubuntu10.04-gems}[https://github.com/opscode/chef/blob/master/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb] template.  This can be overridden using the <tt>-d</tt> or <tt>--template-file</tt> command options.
 
+You can specify the Brightbox zone your new server will use using the `--zone` switch. By default it is `gb1-a`. It can also be `gb1-b` at the time of this writing. See `knife brightbox zone list` to request a current list from the API.
+
 == knife brightbox server delete
 
 Deletes an existing server in the currently configured Brightbox Cloud account by the server/instance id. You can find the instance id by entering 'knife brightbox server list'. You can specify the `--purge` flag to delete the associated node and client objects from the Chef server along with the cloup ip.
@@ -76,6 +84,9 @@ Outputs a list of all available flavors (available hardware configuration for a
 
 Outputs a list of all available images available to the currently configured Brightbox Cloud account.  An image is a collection of files used to create or rebuild a server. Brightbox provides a number of pre-built OS images by default.  This data can be useful when choosing an image id to pass to the <tt>knife brightbox server create</tt> subcommand.
 
+== knife brightbox zone list
+
+Outputs a list of all available zones available to the currently configured Brightbox Cloud account.  A zone represents cloud resources at a datacentre.  Each zone is completely isolated in terms of power, cooling, security and networking equipment.  This data can be useful when choosing an zone handle to pass to the <tt>knife brightbox server create</tt> subcommand.
 
 = LICENSE:
 

data/lib/chef/knife/brightbox_server_create.rb

@@ -110,7 +110,12 @@ class Chef
         :boolean => true,
         :default => false
 
-
+      option :zone,
+        # no short switch because -z is --local-mode
+        :long => "--zone ZONE",
+        :description => "Brightbox zone; default is gb1-a. Can also be gb1-b",
+        :default => 'gb1-a',
+        :proc => Proc.new { |z| Chef::Config[:zone] = z }
 
       def tcp_test_ssh(hostname)
         tcp_socket = TCPSocket.new(hostname, 22)
@@ -143,6 +148,7 @@ class Chef
         server = connection.servers.create(
           :name => config[:server_name],
           :image_id => Chef::Config[:knife][:image],
+          :zone_id => zone_id,
           :flavor_id => Chef::Config[:knife][:flavor] || config[:flavor]
         )
         puts " done \n"
@@ -151,6 +157,7 @@ class Chef
         puts "#{ui.color("Name", :cyan)}: #{server.name}"
         puts "#{ui.color("Flavor", :cyan)}: #{server.flavor_id}"
         puts "#{ui.color("Image", :cyan)}: #{server.image.name}"
+        puts "#{ui.color("Zone", :cyan)}: #{server.zone['handle']}"
 
         print "\n#{ui.color("Waiting server", :magenta)}"
 
@@ -209,6 +216,34 @@ class Chef
         bootstrap
       end
 
+      private
+
+      # Get zone identifiers from Brightbox's API (example: `zon-ca1g2`) and
+      # their handle (example: `gb1-a`). They are not necessarily the same
+      # on every user account.
+      def zones
+        connection.zones.inject({}) do |memo, z|
+          memo[z.handle] = z.id
+
+          memo
+        end
+      end
+
+      def zone_id
+        zone_handle = Chef::Config[:knife][:zone] || config[:zone]
+
+        begin
+          zones.fetch(zone_handle)
+        rescue KeyError
+          ui.error <<-EOF
+This is not a valid zone: #{zone_handle}
+
+Valid zones: #{zones.keys.join(', ')}
+          EOF
+
+          exit 1
+        end
+      end
     end
   end
 end

data/lib/chef/knife/brightbox_zone_list.rb

@@ -0,0 +1,42 @@
+#
+# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Copyright:: Copyright (c) 2011 Opscode, 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/brightbox_base'
+
+class Chef
+  class Knife
+    class BrightboxZoneList < Knife
+
+      include Knife::BrightboxBase
+
+      banner "knife brightbox zone list (options)"
+
+      def run
+        zone_list = [
+          ui.color('Handle (use as the --zone switch)', :bold),
+          ui.color('ID', :bold),
+        ]
+        connection.zones.sort_by(&:handle).each do |zone|
+          zone_list << zone.handle
+          zone_list << zone.id
+        end
+        puts ui.list(zone_list, :columns_across, 2)
+      end
+    end
+  end
+end

data/lib/knife-brightbox/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Brightbox
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: knife-brightbox
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Sergio Rubio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
 description: Plugin to add support for Brightbox's Cloud service to Chef's Knife command
@@ -58,6 +58,7 @@ files:
 - lib/chef/knife/brightbox_server_create.rb
 - lib/chef/knife/brightbox_server_delete.rb
 - lib/chef/knife/brightbox_server_list.rb
+- lib/chef/knife/brightbox_zone_list.rb
 - lib/knife-brightbox/version.rb
 homepage: http://wiki.opscode.com/display/chef
 licenses:
@@ -69,17 +70,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Brightbox Support for Chef's Knife Command