knife-rackspace-cluster 0.0.7 → 0.0.8

data/lib/chef/knife/rax_cluster_base.rb

@@ -106,11 +106,16 @@ class Chef
 				  "post" => "Net::HTTP::Post.new(uri.request_uri, headers)"
 				  }
 			  #Get to work boy! This is Ruby!
+			  ssl_used = false
+			  if uri =~ /https/
+				  ssl_used = true
+			  end
 			  uri = URI.parse(uri)
+			  
 			  http = Net::HTTP.new(uri.host, uri.port)
-			  #if uri.host =~ /https/
+			  if ssl_used
 				  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_change.rb

@@ -31,11 +31,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. 
-#=====================================================================
+=begin
+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. 
+=end
       def change_chef_vars(instances, &block)
         instances.each { |inst|
           query = "name:#{inst['server_name']}"
@@ -45,11 +45,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
-#=====================================================================
+=begin
+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
+=end
       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,10 +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
-#================================================================
+=begin
+Generates a template json file in the current dir called
+map_template.json
+=end
       def generate_map_template
            file_name = "./map_template.json"
            template = %q(
@@ -92,13 +92,13 @@ 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)
+=begin
+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
+=end
+      def create_lb(instances,error_text=nil)
         lb_request = {
           "loadBalancer" => {
             "name" => @lb_name.to_s + "_cluster",
@@ -139,13 +139,16 @@ class Chef
         lb_ip = ""
         lb_details['loadBalancer']['virtualIps'].each {|lb| (lb['ipVersion'] == "IPV4") ? lb_ip = lb['address'] : "not_found"}
         ui.msg "Load Balancer IP Address: #{lb_ip}"
+        if error_text
+          ui.msg "Some nodes failed to bootstrap or boot, verify with knife node list and or nova list to track down errors"
+        end
       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
-#============================================================
+=begin
+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
+=end
       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
@@ -169,6 +172,7 @@ class Chef
             exit(1)
           end
           bootstrap_nodes = []
+          failed_attempts = 0 
           quantity = bp_values['quantity'].to_i
               quantity.times do |node_name|
                   node_name  = rand(900000000)
@@ -180,18 +184,26 @@ class Chef
                   Chef::Config[:environment] = bp_values['chef_env']
                   create_server.config[:run_list] = bp_values['run_list']
                   Chef::Config[:knife][:flavor] = bp_values['flavor']
-                  begin
-                    bootstrap_nodes << Thread.new { Thread.current['server_return'] = create_server.run }
-                  rescue
-                    ui.msg "Bootstrapping failed"
-                  end
+                  bootstrap_nodes << Thread.new { Thread.current['server_return'] = create_server.run }
               end
               quantity.times do |times|
                 if quantity > 20
-                  sleep_interval = 3
+                  sleep_interval = 6
+                else
+                  sleep_interval = 4
                 end
                 sleep(sleep_interval)
-                bootstrap_nodes[times].join              
+                begin
+                  bootstrap_nodes[times].join
+                rescue
+                  failed_attempts += 1
+                  if failed_attempts == quantity
+                    ui.fatal "All servers failed to bootstrap, check network connectivy and vet all cookbooks used"
+                    exit(1)
+                  else
+                    next
+                  end
+                end
                 instances << {"server_name" => bootstrap_nodes[times]['server_return']['server_name'],
                               "ip_address" => bootstrap_nodes[times]['server_return']['private_ip'],
                               "uuid" => bootstrap_nodes[times]['server_return']['server_id'],
@@ -200,11 +212,23 @@ class Chef
                               "run_list" => bp_values['run_list']
                               }
               end
-        end
+            end
         if update_cluster
-          return instances
+          instance_return = {}
+          if failed_attempts > 0
+            instance_return = {'instances' => instances, "error_text" => true}
+          else
+            instance_return = {'instances' => instances, "error_text" => false}
+          end
+          
+          return instance_return
         else
-          create_lb(instances)
+          if failed_attempts > 0
+            create_lb(instances,true)
+          else
+            create_lb(instances)  
+          end
+          
         end
       end
       def run

data/lib/chef/knife/rax_cluster_delete.rb

@@ -21,15 +21,14 @@ 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
-#=====================================================================
+=begin
+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
+=end
       def delete_cluster
         lb_authenticate = authenticate()
         lb_url = ""
-        puts config[:lb_region]
         headers = {"x-auth-token" => lb_authenticate['auth_token'], "content-type" => "application/json"}
         lb_authenticate['lb_urls'].each {|lb|
           if config[:lb_region].to_s.downcase ==  lb['region'].to_s.downcase

data/lib/chef/knife/rax_cluster_expand.rb

@@ -33,16 +33,18 @@ 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
-#================================================================
+=begin
+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
+=end
 	  def expand_cluster
         rs_cluster = RaxClusterCreate.new
         rs_cluster.config[:blue_print]  = config[:blue_print]
         rs_cluster.lb_name = @name_args[0]
         instance_return = rs_cluster.deploy(config[:blue_print],'update_cluster')
+        instance_errors = instance_return['error_text']
+        instance_return = instance_return['instances']
         lb_auth = authenticate()
         puts lb_auth['auth_token']
         headers = {"x-auth-token" => lb_auth['auth_token'], "content-type" => "application/json"}
@@ -77,7 +79,10 @@ class Chef
           lb_stats = make_web_call("get", lb_status, headers)
           lb_stats = JSON.parse(lb_stats.body)
         end
-        node_request = make_web_call("post", node_url, headers, node_data_request.to_json)        
+        node_request = make_web_call("post", node_url, headers, node_data_request.to_json)
+        if instance_errors
+          ui.msg "There were problems bootstrapping/booting nodes, verify with knife node list or nova list to track down issues"
+        end
         ui.msg "Load balancer id #{@lb_id} has been updated"
         
 	  end

data/lib/chef/knife/rax_cluster_list.rb

@@ -22,9 +22,9 @@ class Chef
       :default => "ORD"
       
 
-#=====================================================================
-# Looks for lb's named $variable_cluster and lists them
-#=====================================================================
+=begin
+Looks for lb's named $variable_cluster and lists them
+=end
       def run
         lb_auth = authenticate
         headers = {"x-auth-token" => lb_auth['auth_token'], "content-type" => "application/json"}

data/lib/chef/knife/rax_cluster_show.rb

@@ -0,0 +1,72 @@
+require 'chef/knife/rax_cluster_base'
+class Chef
+  class Knife
+    class RaxClusterShow < Knife
+
+      include Knife::RaxClusterBase
+
+      banner "knife rax cluster show LB_ID -r lb_region"
+      deps do
+        require 'fog'
+        require 'readline'
+        require 'chef/json_compat'
+        require 'chef/knife/bootstrap'
+        Chef::Knife::Bootstrap.load_deps
+      end
+      
+      option :lb_region,
+      :short => "-r lb_region",
+      :long => "--load-balancer-region lb_region",
+      :description => "Load balancer region (only supports ORD || DFW)",
+      :proc => Proc.new { |lb_region| Chef::Config[:knife][:lb_region] = lb_region},
+      :default => "ORD"
+      
+      def run
+        if @name_args.empty?
+          ui.fatal "Please specify Load balancer ID to add nodes too"
+          exit(1)
+        end
+        lb_auth = authenticate
+        headers = {"x-auth-token" => lb_auth['auth_token'], "content-type" => "application/json"}
+        lb_url = ""
+        lb_auth['lb_urls'].each {|lb|
+          if config[:lb_region].to_s.downcase ==  lb['region'].to_s.downcase
+            lb_url = lb['publicURL']
+            break
+          end
+          lb_url = lb['publicURL']
+          }
+        @name_args.each {|arg|
+          lb_url = lb_url + "/loadbalancers/#{arg}.json"
+          lb_data = make_web_call("get", lb_url, headers)
+          lb_data = JSON.parse(lb_data.body)
+          lb = lb_data['loadBalancer']
+            msg_pair("LB Details for #{lb['name']}", " ")
+            msg_pair("\s\s\s\sLB ID", "#{lb['id']}")
+            msg_pair("\s\s\s\sLB Port", "#{lb['port']}")
+            msg_pair("\s\s\s\sLB Algorithm", "#{lb['algorithm']}")
+            msg_pair("\s\s\s\sLB Status", "#{lb['status']}")
+            msg_pair("\s\s\s\sLB timeout", "#{lb['timeout']}")
+            msg_pair("\s\s\s\sVirtual IPs", " ")
+            lb['virtualIps'].each {|ip|
+              msg_pair("\s\s\s\s\s\s\s\sAddress", "#{ip['address']}")
+              msg_pair("\s\s\s\s\s\s\s\sType", "#{ip['type']}")
+              ui.msg "\n"
+              }
+            msg_pair("\s\s\s\sNodes", " ")
+            lb['nodes'].each {|node|
+              msg_pair("\s\s\s\s\s\s\s\sNode Address", "#{node['address']}")
+              msg_pair("\s\s\s\s\s\s\s\sType", "#{node['type']}")
+              msg_pair("\s\s\s\s\s\s\s\sCondition", "#{node['condition']}")
+              msg_pair("\s\s\s\s\s\s\s\sPort", "#{node['port']}")
+              msg_pair("\s\s\s\s\s\s\s\sStatus", "#{node['status']}")
+              ui.msg "\n"
+              }
+          
+        }
+        
+      end
+
+    end
+  end
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: knife-rackspace-cluster
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - zack feldstein
@@ -25,11 +20,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 1
-        - 8
-        - 0
         version: 1.8.0
   type: :runtime
   version_requirements: *id001
@@ -41,9 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -63,6 +50,7 @@ files:
 - lib/chef/knife/rax_cluster_delete.rb
 - lib/chef/knife/rax_cluster_expand.rb
 - lib/chef/knife/rax_cluster_list.rb
+- lib/chef/knife/rax_cluster_show.rb
 - lib/chef/knife/super_rax.rb
 homepage: http://github.com/jrcloud/knife_rax_cluster
 licenses: []
@@ -77,23 +65,17 @@ 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.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Knife rax cluster