knife-joyent 0.1.0 → 0.1.1

data/lib/chef/knife/joyent_base.rb

@@ -55,6 +55,12 @@ class Chef
           )
         end
       end
+
+      def msg_pair(label, value = nil)
+        if value && !value.empty?
+          puts "#{ui.color(label, :cyan)}: #{value}"
+        end
+      end
     end
   end
 end

data/lib/chef/knife/joyent_server_create.rb

@@ -17,23 +17,15 @@ class Chef
 
       banner 'knife joyent server create (options)'
 
+      option :server_name,
+        :short => "-S NAME",
+        :long => "--server-name <name>",
+        :description => "The Joyent server name"
 
-      def is_linklocal(ip)
-        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"
-        block_c = IPAddr.new "192.168.0.0/16"
-        return (block_a.include?(ip) or block_b.include?(ip) or block_c.include?(ip))
-      end
+      option :chef_node_name,
+        :short => "-N NAME",
+        :long => "--node-name NAME",
+        :description => "The Chef node name for your new node"
 
       option :package,
         :short => '-f FLAVOR_NAME',
@@ -51,6 +43,13 @@ class Chef
         :description => "Comma separated list of roles/recipes to apply",
         :proc => lambda { |o| o.split(/[\s,]+/) },
         :default => []
+
+      option :json_attributes,
+        :short => "-j JSON",
+        :long => "--json-attributes JSON",
+        :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",
@@ -69,11 +68,6 @@ class Chef
         :long => "--identity-file IDENTITY_FILE",
         :description => "The SSH identity file used for authentication"
 
-      option :chef_node_name,
-        :short => "-N NAME",
-        :long => "--node-name NAME",
-        :description => "The Chef node name for your new node"
-
       option :prerelease,
         :long => "--prerelease",
         :description => "Install the pre-release chef gems"
@@ -133,37 +127,15 @@ class Chef
         tcp_socket && tcp_socket.close
       end
 
-      # Run Chef bootstrap script
-      def bootstrap_for_node(server, bootstrap_ip_address)
-        bootstrap = Chef::Knife::Bootstrap.new
-        Chef::Log.debug("Bootstrap name_args = [ #{bootstrap_ip_address} ]")
-        bootstrap.name_args = [ bootstrap_ip_address ]
-        Chef::Log.debug("Bootstrap run_list = #{config[:run_list]}")
-        bootstrap.config[:run_list] = config[:run_list]
-        Chef::Log.debug("Bootstrap ssh_user = #{config[:ssh_user]}")
-        bootstrap.config[:ssh_user] = config[:ssh_user]
-        Chef::Log.debug("Bootstrap identity_file = #{config[:identity_file]}")
-        bootstrap.config[:identity_file] = config[:identity_file]
-        Chef::Log.debug("Bootstrap chef_node_name = #{config[:chef_node_name]}")
-        bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.id
-        Chef::Log.debug("Bootstrap prerelease = #{config[:prerelease]}")
-        bootstrap.config[:prerelease] = config[:prerelease]
-        Chef::Log.debug("Bootstrap distro = #{config[:distro]}")
-        bootstrap.config[:distro] = config[:distro]
-        #Chef::Log.debug("Bootstrap use_sudo = #{config[:use_sudo]}")
-        #bootstrap.config[:use_sudo] = true
-        Chef::Log.debug("Bootstrap environment = #{config[:environment]}")
-        bootstrap.config[:environment] = config[:environment]
-        Chef::Log.debug("Bootstrap no_host_key_verify = #{config[:no_host_key_verify]}")
-        bootstrap.config[:no_host_key_verify] = config[:no_host_key_verify]
-
-        bootstrap
-      end
-
       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
 
         node_name = config[:chef_node_name] || config[:server_name]
 
@@ -179,9 +151,7 @@ class Chef
         server.wait_for { print "."; ready? }
 
         #which IP address to bootstrap
-        bootstrap_ip_addresses = server.ips.select{|ip| 
-          ip and not(is_loopback(ip) or is_linklocal(ip))
-        }
+        bootstrap_ip_addresses = server.ips.select{ |ip| ip and not(is_loopback(ip) or is_linklocal(ip)) }
 
         if bootstrap_ip_addresses.count == 1
           bootstrap_ip_address = bootstrap_ip_addresses.first
@@ -215,6 +185,7 @@ class Chef
         msg_pair("Type", server.type)
         msg_pair("Dataset", server.dataset)
         msg_pair("IP's", server.ips)
+        msg_pair("JSON Attributes",config[:json_attributes]) unless config[:json_attributes].empty?
       end
 
       # Run Chef bootstrap script
@@ -240,15 +211,11 @@ class Chef
         bootstrap.config[:environment] = config[:environment]
         Chef::Log.debug("Bootstrap no_host_key_verify = #{config[:no_host_key_verify]}")
         bootstrap.config[:no_host_key_verify] = config[:no_host_key_verify]
+        Chef::Log.debug("Bootstrap json_attributes = #{config[:json_attributes]}")
+        bootstrap.config[:first_boot_attributes] = config[:json_attributes]
 
         bootstrap
       end
-      
-      def msg_pair(label, value = nil)
-        if value && !value.empty?
-          puts "#{ui.color(label, :cyan)}: #{value}"
-        end
-      end
     end
   end
 end

data/lib/knife-joyent/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog