knife-rackspace-cluster 0.0.5 → 0.0.6

data/lib/chef/knife/rax_cluster_base.rb

@@ -107,11 +107,10 @@ class Chef
 				  }
 			  #Get to work boy! This is Ruby!
 			  uri = URI.parse(uri)
-			  
 			  http = Net::HTTP.new(uri.host, uri.port)
-			  #if uri.host =~ /https/
+			  if uri.host =~ /https/
 				  http.use_ssl = true
-			  #end
+			  end
 			  http.verify_mode = OpenSSL::SSL::VERIFY_NONE
 			  request = eval verbs[httpVerb]
 			  if httpVerb == 'post' or httpVerb == 'put'

data/lib/chef/knife/rax_cluster_build.rb

@@ -1,4 +1,7 @@
-
+#=====================================================================
+# Had to subclass this from knife-rackspace, neeeded to return the
+# Instance data after build/bootstrap
+#=====================================================================
 require 'chef/knife/rackspace_server_create'
 class Chef
   class Knife

data/lib/chef/knife/rax_cluster_change.rb

@@ -29,7 +29,11 @@ class Chef
       :long => "--chef-env environment",
       :description => "Pass a comma delimted run list --run-list 'recipe[apt],role[base]'",
       :proc => Proc.new { |chef_env| Chef::Config[:knife][:chef_env] = chef_env}
-      
+#=====================================================================
+# Takes an array of hashes of instance data and a block that provides
+# what work should be done. This function will look up the chef object
+# For the node and pass that object into the calling block. 
+#=====================================================================
       def change_chef_vars(instances, &block)
         instances.each { |inst|
           query = "name:#{inst['server_name']}"
@@ -39,6 +43,11 @@ class Chef
           end
         }
       end
+#=====================================================================
+# Looks up the LB meta data and grabs the server name for every node
+# In the LB pool
+# Looks them up in chef and changes there run_list or chef_env
+#=====================================================================
       def run
         if !config[:run_list] and !config[:chef_env]
           ui.fatal "Please specify either --run-list or --chef-env to change on your cluster"

data/lib/chef/knife/rax_cluster_create.rb

@@ -66,7 +66,10 @@ class Chef
       #:long => "--session-persistence session_persistence_on_or_off",
       #:description => "Load balancer session persistence on or off",
       #:proc => Proc.new { |session_persistence| Chef::Config[:knife][:session_persistence] = session_persistence}
-
+#================================================================
+# Generates a template json file in the current dir called
+# map_template.json
+#================================================================
       def generate_map_template
            file_name = "./map_template.json"
            template = %q(
@@ -89,6 +92,12 @@ class Chef
      
            File.open(file_name, 'w') { |file| file.write(template)}
       end
+#================================================================
+# Takes instance array of hash data and creates a load balancer.
+# Will put all nodes created in the LB pool (using private IP)
+# Will store servers in meta data using key = server name
+# value = uuid, this is for updates on chef vars on these nodes
+#================================================================
       def create_lb(instances)
         lb_request = {
           "loadBalancer" => {
@@ -131,14 +140,34 @@ class Chef
         lb_details['loadBalancer']['virtualIps'].each {|lb| (lb['ipVersion'] == "IPV4") ? lb_ip = lb['address'] : "not_found"}
         ui.msg "Load Balancer IP Address: #{lb_ip}"
       end
-      
-      
+#============================================================
+# Parses json, creates blue_prints w/ specified chef vars
+# If ruby 1.9 is used builds will be spun up with Threads
+# If update_cluster is specified, an LB will not be created
+# an array of instance data will be returned to the caller
+#============================================================
       def deploy(blue_print,update_cluster=nil)
         (File.exist?(blue_print)) ? map_contents = JSON.parse(File.read(blue_print)) : map_contents = JSON.parse(blue_print)
         sleep_interval = 1
         instances = []
         if map_contents.has_key?("blue_print")
           bp_values = map_contents['blue_print']
+          unless bp_values.has_key?("image_ref")
+            ui.fatal "You must specify an image_ref, run the -G command to generate a template blueprint"
+            exit(1)
+          end
+          unless bp_values.has_key?("name_convention")
+            ui.fatal "You must specify a name_convention, run the -G command to generate a template blueprint"
+            exit(1)
+          end
+          unless bp_values.has_key?("flavor")
+            ui.fatal "You must specify a flavor, run the -G command to generate a template blueprint"
+            exit(1)
+          end
+          unless bp_values.has_key?("quantity")
+            ui.fatal "You must specify a quantity of servers, run the -G command to generate a template blueprint"
+            exit(1)
+          end
           bootstrap_nodes = []
           quantity = bp_values['quantity'].to_i
               quantity.times do |node_name|
@@ -156,7 +185,6 @@ class Chef
                   rescue
                     ui.msg "Bootstrapping failed"
                   end
-                  
               end
               quantity.times do |times|
                 if quantity > 20
@@ -178,11 +206,7 @@ class Chef
         else
           create_lb(instances)
         end
-        
-        
-        
       end
-
       def run
         #Generate template config
 		if config[:generate_map_template]
@@ -190,8 +214,6 @@ class Chef
 		  ui.msg "Map template saved as ./map_template.json"
 		  exit()
 		end
-        
-        
         if @name_args.empty? or @name_args.size > 1
 		  ui.fatal "Please specify a single name for your cluster"
 		  exit(1)

data/lib/chef/knife/rax_cluster_delete.rb

@@ -21,7 +21,11 @@ class Chef
       :description => "Load balancer region (only supports ORD || DFW)",
       :proc => Proc.new { |lb_region| Chef::Config[:knife][:lb_region] = lb_region},
       :default => "ORD"
-
+#=====================================================================
+# Looks up all nodes from lb meta data, deletes them from chef and nova
+# Via knife rackspace method
+# AFter node deletion it will delete the LB
+#=====================================================================
       def delete_cluster
         lb_authenticate = authenticate()
         lb_url = ""

data/lib/chef/knife/rax_cluster_expand.rb

@@ -34,7 +34,11 @@ class Chef
       :description => "Load balancer region (only supports ORD || DFW)",
       :proc => Proc.new { |lb_region| Chef::Config[:knife][:lb_region] = lb_region},
       :default => "ORD"
-	  
+#================================================================
+# This will take a blueprint file and call the raxClusterCreate
+# Class to handle parsing and building the nodes. It will then
+# update the LB ID passed on the CLI with the nodes and meta data
+#================================================================
 	  def expand_cluster
         rs_cluster = RaxClusterCreate.new
         rs_cluster.config[:blue_print]  = config[:blue_print]

data/lib/chef/knife/rax_cluster_list.rb

@@ -20,8 +20,10 @@ class Chef
       :proc => Proc.new { |lb_region| Chef::Config[:knife][:lb_region] = lb_region},
       :default => "ORD"
       
-      
-      
+
+#=====================================================================
+# Looks for lb's named $variable_cluster and lists them
+#=====================================================================
       def run
         lb_auth = authenticate
         headers = {"x-auth-token" => lb_auth['auth_token'], "content-type" => "application/json"}

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: knife-rackspace-cluster
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
-  version: 0.0.5
+  segments: 
+  - 0
+  - 0
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - zack feldstein
@@ -20,6 +25,11 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 1
+        - 8
+        - 0
         version: 1.8.0
   type: :runtime
   version_requirements: *id001
@@ -31,6 +41,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -64,17 +77,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Knife rax cluster