knife-joyent 0.1.1 → 0.1.3

data/README.md

@@ -26,11 +26,14 @@ Currently available commands:
     knife joyent key delete <name>
     knife joyent key list
     knife joyent server create (options)
+    knife joyent server delete <server_id>
     knife joyent server list <options>
     knife joyent server reboot <server_id>
     knife joyent server resize <server_id> -f <flavor>
     knife joyent server start <server_id>
     knife joyent server stop <server_id>
+    knife joyent server metadata update <server_id> -m <json>
+    knife joyent server metadata delete <server_id> <options>
     knife joyent snapshot create <server_id> <snapshot_name>
     knife joyent snapshot delete <server_id> <snapshot_name>
     knife joyent snapshot list <server_id>
@@ -70,6 +73,16 @@ provider powered by [SmartDataCenter](http://www.joyent.com/products/smartdatace
     # Defaults to https://us-west-1.api.joyentcloud.com/
     knife[:joyent_api_url] = "https://us-sw-1.api.joyentcloud.com/"
 
+**joyent_metadata**
+
+Metadata to apply to each provisioned machine via the Metadata API. This should take
+the form of a hash with a single level of nesting. See the
+[Metadata API](http://wiki.joyent.com/wiki/display/sdc/Using+the+Metadata+API) for more info.
+
+    knife[:joyent_metadata] = {
+      "some_data" => "value"
+    }
+
 ## Contributors
 
  - [Sean Omera](https://github.com/someara) - Opscode

data/lib/chef/knife/joyent_server_create.rb

@@ -50,7 +50,7 @@ class Chef
         :description => "A JSON string to be added to the first run of chef-client",
         :proc => lambda { |o| JSON.parse(o) },
         :default => {}
-        
+
       option :private_network,
         :long => "--private-network",
         :description => "Use the private IP for bootstrapping rather than the public IP",
@@ -79,6 +79,12 @@ class Chef
         :proc => Proc.new { |d| Chef::Config[:knife][:distro] = d },
         :default => "chef-full"
 
+      option :joyent_metadata,
+        :long => '--metadata JSON',
+        :description => 'Metadata to apply to machine',
+        :proc => Proc.new { |m| JSON.parse(m) },
+        :default => {}
+
       option :no_host_key_verify,
         :long => "--no-host-key-verify",
         :description => "Disable host key verification",
@@ -89,12 +95,12 @@ class Chef
         linklocal = IPAddr.new "169.254.0.0/16"
         return linklocal.include?(ip)
       end
-      
+
       def is_loopback(ip)
         loopback = IPAddr.new "127.0.0.0/8"
         return loopback.include?(ip)
       end
-      
+
       def is_private(ip)
         block_a = IPAddr.new "10.0.0.0/8"
         block_b = IPAddr.new "172.16.0.0/12"
@@ -130,22 +136,17 @@ class Chef
       def run
         $stdout.sync = true
 
-        # add some validation here ala knife-ec2
-        unless config[:server_name] || config[:chef_node_name]
-          ui.error("You have not provided a valid server or node name.")
-          show_usage
-          exit 1
-        end
+        validate_server_name
 
         node_name = config[:chef_node_name] || config[:server_name]
 
         puts ui.color("Creating machine #{node_name}", :cyan)
 
-        server = connection.servers.create(
+        server = connection.servers.create({
           :name => node_name,
           :dataset => config[:dataset],
           :package => config[:package]
-        )
+        }.merge(joyent_metadata))
 
         print "\n#{ui.color("Waiting for server", :magenta)}"
         server.wait_for { print "."; ready? }
@@ -171,7 +172,19 @@ class Chef
 
         puts ui.color("attempting to bootstrap on #{bootstrap_ip_address}", :cyan)
 
-        print(".") until tcp_test_ssh(bootstrap_ip_address) {
+        ssh_test_max = 10*60
+        ssh_test = 0
+
+        begin
+          if ssh_test < ssh_test_max
+            print(".")
+            ssh_test += 1
+            sleep 1
+          else
+            ui.error("Unable to ssh to node (#{bootstrap_ip_address}), exiting")
+            exit 1
+          end
+        end until tcp_test_ssh(bootstrap_ip_address) {
           sleep @initial_sleep_delay ||= 10
           puts("done")
         }
@@ -216,6 +229,25 @@ class Chef
 
         bootstrap
       end
+
+      private
+
+      def validate_server_name
+        # add some validation here ala knife-ec2
+        unless config[:server_name] || config[:chef_node_name]
+          ui.error("You have not provided a valid server or node name.")
+          show_usage
+          exit 1
+        end
+      end
+
+      def joyent_metadata
+        metadata = Chef::Config[:knife][:joyent_metadata] || {}
+        metadata.merge!(config[:joyent_metadata])
+
+        return {} if metadata.empty?
+        Hash[metadata.map { |k, v| ["metadata.#{k}", v] }]
+      end
     end
   end
 end

data/lib/chef/knife/joyent_server_metadata_delete.rb

@@ -0,0 +1,89 @@
+require 'chef/knife/joyent_base'
+
+class Chef
+  class Knife
+    class JoyentServerMetadataDelete < Knife
+
+      include Knife::JoyentBase
+
+      attr_reader :server
+
+      banner 'knife joyent server metadata delete <server_id> <options>'
+
+      option :keys,
+        :short => "-k KEY",
+        :long => "--key KEY",
+        :description => "Key (or comma separated keys) to delete",
+        :proc => lambda { |o| o.split(/[\s,]+/) },
+        :default => []
+
+      option :all,
+        :long => "--all",
+        :description => "Delete all metadata",
+        :boolean => true,
+        :default => false
+
+      def run
+        unless name_args.size === 1
+          show_usage
+          exit 1
+        end
+
+        if config[:keys].empty? and not config[:all]
+          show_usage
+          exit 1
+        end
+
+        id = name_args.first
+
+        @server = self.connection.servers.get(id)
+        unless server
+          puts ui.error("Server with id: #{id} not found")
+          exit 1
+        end
+
+        delete_all_keys if config[:all]
+        delete_keys
+
+        if server.update_metadata(config[:metadata])
+          puts ui.color("Updated metadata on #{id}", :cyan)
+          exit 0
+        else
+          puts ui.error("Metadata update failed")
+          exit 1
+        end
+      end
+
+      private
+
+      def delete_all_keys
+        if server.delete_all_metadata
+          msg("Deleted all metadata on #{server.id}")
+          exit 0
+        else
+          fail
+        end
+      end
+
+      def delete_keys
+        config[:keys].each do |key|
+          if server.delete_metadata(key)
+            msg("Deleted metadata key: #{key} on #{server.name}")
+          else
+            fail
+          end
+        end
+        exit 0
+      end
+
+      def msg(msg)
+        puts ui.color(msg, :cyan)
+      end
+
+      def fail
+        puts ui.error("Metadata delete failed")
+        exit 1
+      end
+    end
+  end
+end

data/lib/chef/knife/joyent_server_metadata_update.rb

@@ -0,0 +1,47 @@
+require 'chef/knife/joyent_base'
+
+class Chef
+  class Knife
+    class JoyentServerMetadataUpdate < Knife
+
+      include Knife::JoyentBase
+
+      banner 'knife joyent server metadata update <server_id> -m <json>'
+
+      option :metadata,
+        :short => "-m JSON",
+        :long => "--metadata JSON",
+        :description => "Metadata to be applied to server",
+        :proc => Proc.new { |m| JSON.parse(m) },
+        :default => {}
+
+      def run
+        if config[:metadata].empty?
+          show_usage
+          exit 1
+        end
+
+        unless name_args.size === 1
+          show_usage
+          exit 1
+        end
+
+        id = name_args.first
+
+        server = self.connection.servers.get(id)
+        unless server
+          puts ui.error("Server with id: #{id} not found")
+          exit 1
+        end
+
+        if server.update_metadata(config[:metadata])
+          puts ui.color("Updated metadata on #{id}", :cyan)
+          exit 0
+        else
+          puts ui.error("Metadata update failed")
+          exit 1
+        end
+      end
+    end
+  end
+end

data/lib/knife-joyent/version.rb

@@ -1,3 +1,3 @@
 module KnifeJoyent
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -67,6 +67,8 @@ files:
 - lib/chef/knife/joyent_server_create.rb
 - lib/chef/knife/joyent_server_delete.rb
 - lib/chef/knife/joyent_server_list.rb
+- lib/chef/knife/joyent_server_metadata_delete.rb
+- lib/chef/knife/joyent_server_metadata_update.rb
 - lib/chef/knife/joyent_server_reboot.rb
 - lib/chef/knife/joyent_server_resize.rb
 - lib/chef/knife/joyent_server_start.rb