knife-brightbox 0.1.6 → 0.2.0

data/CHANGELOG

@@ -0,0 +1,8 @@
+# 0.2
+
+* Added the ability to add server groups during bootstrap (@gkarekinian)
+  
+  http://git.io/TOcHhQ
+
+* Fixes from @gkarekinian, @kangguru
+* Newer version of Fog required (1.5.0)

data/knife-brightbox.gemspec

@@ -16,8 +16,7 @@ Gem::Specification.new do |s|
   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.add_dependency "fog", "~> 0.8"
+  s.add_dependency "fog", ">= 1.5.0"
   s.add_dependency "chef", ">= 0.10"
   s.require_paths = ["lib"]
-
 end

data/lib/chef/knife/brightbox_flavor_list.rb

@@ -27,23 +27,25 @@ class Chef
       banner "knife brightbox flavor list (options)"
 
       def run
-        flavor_list = [ 
+        flavor_list = [
           ui.color('ID', :bold),
           ui.color('Name', :bold),
+          ui.color('Handle', :bold),
           ui.color('Architecture', :bold),
           ui.color('RAM', :bold),
           ui.color('Disk', :bold),
           ui.color('Cores', :bold)
         ]
-        connection.flavors.sort_by(&:id).each do |flavor|
+        connection.flavors.sort_by(&:ram).each do |flavor|
           flavor_list << flavor.id.to_s
           flavor_list << flavor.name
+          flavor_list << flavor.handle
           flavor_list << "#{flavor.bits.to_s}-bit"
-          flavor_list << "#{flavor.ram.to_s}"
-          flavor_list << "#{flavor.disk.to_s} GB"
+          flavor_list << "#{flavor.ram.to_s} MB"
+          flavor_list << "#{flavor.disk / 1024} GB"
           flavor_list << flavor.cores.to_s
         end
-        puts ui.list(flavor_list, :columns_across, 6)
+        puts ui.list(flavor_list, :columns_across, 7)
       end
     end
   end

data/lib/chef/knife/brightbox_image_list.rb

@@ -29,15 +29,17 @@ class Chef
       def run
         image_list = [
           ui.color('ID', :bold),
-          ui.color('Name', :bold)
+          ui.color('Name', :bold),
+          ui.color('Status', :bold)
         ]
 
         connection.images.sort_by(&:name).each do |image|
           image_list << image.id.to_s
           image_list << image.name
+          image_list << (image.public ? "public" : "private")
         end
 
-        puts ui.list(image_list, :columns_across, 2)
+        puts ui.list(image_list, :columns_across, 3)
       end
     end
   end

data/lib/chef/knife/brightbox_server_create.rb

@@ -47,6 +47,13 @@ class Chef
         :description => "The image of the server",
         :proc => Proc.new { |i| Chef::Config[:knife][:image] = i }
 
+      option :server_groups,
+        :short => "-g grp-xxxxx,gpr-yyyyy",
+        :long => "--server-groups grp-xxxxx,gpr-yyyyy",
+        :description => "Server groups to place server in (comma delimited)",
+        :proc => Proc.new { |server_groups| server_groups.split(',') },
+        :default => []
+
       option :server_name,
         :short => "-S NAME",
         :long => "--server-name NAME",
@@ -142,7 +149,7 @@ class Chef
 
         puts "#{ui.color("Instance ID", :cyan)}: #{server.id}"
         puts "#{ui.color("Name", :cyan)}: #{server.name}"
-        puts "#{ui.color("Flavor", :cyan)}: #{server.flavor.name}"
+        puts "#{ui.color("Flavor", :cyan)}: #{server.flavor_id}"
         puts "#{ui.color("Image", :cyan)}: #{server.image.name}"
 
         print "\n#{ui.color("Waiting server", :magenta)}"
@@ -161,21 +168,26 @@ class Chef
         puts " done\n"
 
         server = connection.servers.get(server.id)
-        puts "#{ui.color("Public IP Address", :cyan)}: #{server.public_ip_address['public_ip'] rescue ''}"
-        puts "#{ui.color("Private IP Address", :cyan)}: #{server.private_ip_address['ipv4_address']}"
+        puts "#{ui.color("Public IP Address", :cyan)}: #{server.public_ip_address}"
+        puts "#{ui.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
+
+        config[:server_groups].each do |server_group|
+          connection.add_servers_server_group(server_group,
+                                              :servers => [{ :server => server.id }])
+        end
 
-        print "\n#{ui.color("Bootstraping server ", :magenta)}"
+        print "\n#{ui.color("Bootstrapping server ", :magenta)}"
         print "\n#{ui.color("Waiting for sshd ", :magenta)}"
-        print(".") until tcp_test_ssh(server.public_ip_address["public_ip"]) { sleep @initial_sleep_delay ||= 10; puts(" done") }
+        print(".") until tcp_test_ssh(server.public_ip_address) { sleep @initial_sleep_delay ||= 10; puts(" done") }
         bootstrap_for_node(server).run
 
         puts "\n"
         puts "#{ui.color("Instance ID", :cyan)}: #{server.id}"
         puts "#{ui.color("Name", :cyan)}: #{server.name}"
-        puts "#{ui.color("Flavor", :cyan)}: #{server.flavor.name}"
+        puts "#{ui.color("Flavor", :cyan)}: #{server.flavor_id}"
         puts "#{ui.color("Image", :cyan)}: #{server.image.name}"
-        puts "#{ui.color("Public IP Address", :cyan)}: #{server.public_ip_address['public_ip'] rescue ''}"
-        puts "#{ui.color("Private IP Address", :cyan)}: #{server.private_ip_address['ipv4_address']}"
+        puts "#{ui.color("Public IP Address", :cyan)}: #{server.public_ip_address}"
+        puts "#{ui.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
         puts "#{ui.color("Environment", :cyan)}: #{config[:environment] || '_default'}"
         puts "#{ui.color("Run List", :cyan)}: #{config[:run_list].join(', ')}"
       end

data/lib/chef/knife/brightbox_server_list.rb

@@ -28,10 +28,10 @@ class Chef
 
       def run
         $stdout.sync = true
-
         server_list = [
           ui.color('Instance ID', :bold),
           ui.color('Private IP', :bold),
+          ui.color('Cloud IP', :bold),
           ui.color('Flavor', :bold),
           ui.color('Image', :bold),
           ui.color('Name', :bold),
@@ -39,8 +39,9 @@ class Chef
         ]
         connection.servers.all.each do |server|
           server_list << server.id.to_s
-          server_list << server.private_ip_address["ipv4_address"]
-          server_list << (server.flavor_id == nil ? "" : server.flavor_id.to_s)
+          server_list << server.interfaces.map{|i| i["ipv4_address"]}.join(", ")
+          server_list << server.cloud_ips.map{|i| i["public_ip"]}.join(", ")
+          server_list << server.server_type["handle"].to_s
           server_list << (server.image_id == nil ? "" : server.image_id.to_s)
           server_list << server.name
           server_list << begin
@@ -54,8 +55,8 @@ class Chef
             end
           end
         end
-        puts ui.list(server_list, :columns_across, 6)
 
+        puts ui.list(server_list, :columns_across, 7)
       end
     end
   end

data/lib/knife-brightbox/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-brightbox
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &19169160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *19169160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &19168580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *19168580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.10'
 description: Brightbox Support for Chef's Knife Command
 email:
 - rubiojr@frameos.org
@@ -43,6 +53,7 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files:
+- CHANGELOG
 - LICENSE
 - README.rdoc
 - knife-brightbox.gemspec
@@ -73,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Brightbox Support for Chef's Knife Command