ironfan 4.0.8 → 4.0.9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v4.0.9:
+* Making bootstrap work again (fixes #159)
+
 # v4.0.8:
 * Removed .delegates_to, .parallelize in favor of manual delegation (via .each) and .parallel, to remove assumption that calls must be in the context of the individual object (preparation for fixing bootstrapping)
 * Adding cluster and facet roles to server run list (fixes #160)

data/VERSION

@@ -1 +1 @@
-4.0.8
+4.0.9

data/config/ubuntu10.04-ironfan.erb

@@ -5,7 +5,7 @@ bash <<'EOF' || echo "Chef bootstrap failed!"
 #
 # * installs ruby 1.9.2 (not 1.8.7) from source
 # * upgrades rubygems rather than installing from source
-# * pushes the node identity into the first-boot.json
+# * pushes the computer identity into the first-boot.json
 # * installs the chef-client service and kicks off the first run of chef
 
 set -e
@@ -127,13 +127,13 @@ echo -e "`date` \n\n**** \n**** Creating chef client script:\n****\n"
 (
 cat <<'EOP'
 <%= config_content %>
-<%= @config[:node].chef_client_script_content %>
+<%= @config[:computer].chef_client_script_content %>
 EOP
 ) > /etc/chef/client.rb
 
 (
 cat <<'EOP'
-<%= { "run_list" => @run_list, "cluster_name" => @config[:node].cluster_name, "facet_name" => @config[:node].facet_name, "facet_index" => @config[:node].facet_index }.to_json %>
+<%= { "run_list" => @run_list, "cluster_name" => @config[:server].cluster_name, "facet_name" => @config[:server].facet_name, "facet_index" => @config[:server].index }.to_json %>
 EOP
 ) > /etc/chef/first-boot.json
 

data/config/ubuntu11.10-ironfan.erb

@@ -5,7 +5,7 @@ bash <<'EOF' || echo "Chef bootstrap failed!"
 #
 # * installs ruby 1.9.2 (not 1.8.7) using the system ruby
 # * upgrades rubygems rather than installing from source
-# * pushes the node identity into the first-boot.json
+# * pushes the computer identity into the first-boot.json
 # * installs the chef-client service and kicks off the first run of chef
 
 set -e
@@ -115,13 +115,13 @@ echo -e "`date` \n\n**** \n**** Creating chef client script:\n****\n"
 (
 cat <<'EOP'
 <%= config_content %>
-<%= @config[:node].chef_client_script_content %>
+<%= @config[:computer].chef_client_script_content %>
 EOP
 ) > /etc/chef/client.rb
 
 (
 cat <<'EOP'
-<%= { "run_list" => @run_list, "cluster_name" => @config[:node].cluster_name, "facet_name" => @config[:node].facet_name, "facet_index" => @config[:node].facet_index }.to_json %>
+<%= { "run_list" => @run_list, "cluster_name" => @config[:server].cluster_name, "facet_name" => @config[:server].facet_name, "facet_index" => @config[:server].index }.to_json %>
 EOP
 ) > /etc/chef/first-boot.json
 

data/ironfan.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.0.8"
+  s.version = "4.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]

data/lib/chef/knife/bootstrap/centos6.2-ironfan.erb

@@ -5,7 +5,7 @@ bash <<'EOF' || echo "Chef bootstrap failed!"
 #
 # * installs ruby 1.9.2 (not 1.8.7) from source
 # * upgrades rubygems rather than installing from source
-# * pushes the node identity into the first-boot.json
+# * pushes the computer identity into the first-boot.json
 # * installs the chef-client service and kicks off the first run of chef
 
 set -e
@@ -109,13 +109,13 @@ echo -e "`date` \n\n**** \n**** Creating chef client script:\n****\n"
 (
 cat <<'EOP'
 <%= config_content %>
-<%= @config[:node].chef_client_script_content %>
+<%= @config[:computer].chef_client_script_content %>
 EOP
 ) > /etc/chef/client.rb
 
 (
 cat <<'EOP'
-<%= { "run_list" => @run_list, "cluster_name" => @config[:node].cluster_name, "facet_name" => @config[:node].facet_name, "facet_index" => @config[:node].facet_index }.to_json %>
+<%= { "run_list" => @run_list, "cluster_name" => @config[:server].cluster_name, "facet_name" => @config[:server].facet_name, "facet_index" => @config[:server].index }.to_json %>
 EOP
 ) > /etc/chef/first-boot.json
 

data/lib/chef/knife/bootstrap/ubuntu10.04-ironfan.erb

@@ -5,7 +5,7 @@ bash <<'EOF' || echo "Chef bootstrap failed!"
 #
 # * installs ruby 1.9.2 (not 1.8.7) from source
 # * upgrades rubygems rather than installing from source
-# * pushes the node identity into the first-boot.json
+# * pushes the computer identity into the first-boot.json
 # * installs the chef-client service and kicks off the first run of chef
 
 set -e
@@ -127,13 +127,13 @@ echo -e "`date` \n\n**** \n**** Creating chef client script:\n****\n"
 (
 cat <<'EOP'
 <%= config_content %>
-<%= @config[:node].chef_client_script_content %>
+<%= @config[:computer].chef_client_script_content %>
 EOP
 ) > /etc/chef/client.rb
 
 (
 cat <<'EOP'
-<%= { "run_list" => @run_list, "cluster_name" => @config[:node].cluster_name, "facet_name" => @config[:node].facet_name, "facet_index" => @config[:node].facet_index }.to_json %>
+<%= { "run_list" => @run_list, "cluster_name" => @config[:server].cluster_name, "facet_name" => @config[:server].facet_name, "facet_index" => @config[:server].index }.to_json %>
 EOP
 ) > /etc/chef/first-boot.json
 

data/lib/chef/knife/bootstrap/ubuntu11.10-ironfan.erb

@@ -5,7 +5,7 @@ bash <<'EOF' || echo "Chef bootstrap failed!"
 #
 # * installs ruby 1.9.2 (not 1.8.7) using the system ruby
 # * upgrades rubygems rather than installing from source
-# * pushes the node identity into the first-boot.json
+# * pushes the computer identity into the first-boot.json
 # * installs the chef-client service and kicks off the first run of chef
 
 set -e
@@ -115,13 +115,13 @@ echo -e "`date` \n\n**** \n**** Creating chef client script:\n****\n"
 (
 cat <<'EOP'
 <%= config_content %>
-<%= @config[:node].chef_client_script_content %>
+<%= @config[:computer].chef_client_script_content %>
 EOP
 ) > /etc/chef/client.rb
 
 (
 cat <<'EOP'
-<%= { "run_list" => @run_list, "cluster_name" => @config[:node].cluster_name, "facet_name" => @config[:node].facet_name, "facet_index" => @config[:node].facet_index }.to_json %>
+<%= { "run_list" => @run_list, "cluster_name" => @config[:server].cluster_name, "facet_name" => @config[:server].facet_name, "facet_index" => @config[:server].index }.to_json %>
 EOP
 ) > /etc/chef/first-boot.json
 

data/lib/chef/knife/cluster_bootstrap.rb

@@ -60,9 +60,8 @@ class Chef
 
       def perform_execution(target)
         # Execute across all servers in parallel
-        threads = target.servers.map{ |server| Thread.new(server) { |svr| run_bootstrap(svr, svr.public_hostname) } }
-        # Wait for the threads to finish and return the array of thread's exit value
-        threads.map{ |t| t.join.value }
+        Ironfan.parallel(target.values) {|computer| run_bootstrap(computer)}
+#         threads = target.servers.map{ |server| Thread.new(server) { |svr| run_bootstrap(svr, svr.public_hostname) } }
       end
 
       def confirm_execution(target)

data/lib/chef/knife/cluster_launch.rb

@@ -51,7 +51,7 @@ class Chef
 
       option :bootstrap,
         :long        => "--[no-]bootstrap",
-        :description => "Also bootstrap the launched node (default is NOT to bootstrap)",
+        :description => "Also bootstrap the launched machine (default is NOT to bootstrap)",
         :boolean     => true,
         :default     => false
 
@@ -81,61 +81,60 @@ class Chef
         display(target)
         target.launch
 
-        Chef::Log.warn("Need to set up target.parallelize")
-        # TODO:
-        # # As each server finishes, configure it
-        # watcher_threads = target.parallelize do |svr|
-        #   perform_after_launch_tasks(svr)
-        # end
-        #
+        # As each server finishes, configure it
+        Ironfan.parallel(target.values) do |computer|
+          perform_after_launch_tasks(computer)
+        end
         # progressbar_for_threads(watcher_threads)
 
         display(target)
       end
 
-#       def perform_after_launch_tasks(server)
-#         # Wait for node creation on amazon side
+      def perform_after_launch_tasks(computer)
+        # Wait for machine creation on amazon side
 #         server.fog_server.wait_for{ ready? }
-# 
-#         # Try SSH
-#         unless config[:dry_run]
+        computer.machine.wait_for{ ready? }
+
+        # Try SSH
+        unless config[:dry_run]
 #           nil until tcp_test_ssh(server.fog_server.dns_name){ sleep @initial_sleep_delay ||= 10  }
-#         end
-# 
+          nil until tcp_test_ssh(computer.machine.dns_name){ sleep @initial_sleep_delay ||= 10  }
+        end
+
 #         # Make sure our list of volumes is accurate
 #         Ironfan.fetch_fog_volumes
 #         server.discover_volumes!
-# 
-#         # Attach volumes, etc
+
+        # Attach volumes, etc
 #         server.sync_to_cloud
-# 
-#         # Run Bootstrap
-#         if config[:bootstrap]
-#           run_bootstrap(server, server.fog_server.dns_name)
-#         end
-#       end
-# 
-#       def tcp_test_ssh(hostname)
-#         tcp_socket = TCPSocket.new(hostname, 22)
-#         readable = IO.select([tcp_socket], nil, nil, 5)
-#         if readable
-#           Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
-#           yield
-#           true
-#         else
-#           false
-#         end
-#       rescue Errno::ETIMEDOUT
-#         false
-#       rescue Errno::ECONNREFUSED
-#         sleep 2
-#         false
-#       rescue Errno::EHOSTUNREACH
-#         sleep 2
-#         false
-#       ensure
-#         tcp_socket && tcp_socket.close
-#       end
+        computer.save
+
+        # Run Bootstrap
+        Chef::Log.warn "UNTESTED --bootstrap"
+        run_bootstrap(computer) if config[:bootstrap]
+      end
+
+      def tcp_test_ssh(hostname)
+        tcp_socket = TCPSocket.new(hostname, 22)
+        readable = IO.select([tcp_socket], nil, nil, 5)
+        if readable
+          Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
+          yield
+          true
+        else
+          false
+        end
+      rescue Errno::ETIMEDOUT
+        false
+      rescue Errno::ECONNREFUSED
+        sleep 2
+        false
+      rescue Errno::EHOSTUNREACH
+        sleep 2
+        false
+      ensure
+        tcp_socket && tcp_socket.close
+      end
 
       def warn_or_die_on_bogus_servers(target)
         ui.info("")

data/lib/chef/knife/ironfan_knife_common.rb

@@ -51,8 +51,8 @@ module Ironfan
     end
 
     # method to nodes should be filtered on
-    def relevant?(server)
-      server.exists?
+    def relevant?(computer)
+      computer.running?
     end
 
     # override in subclass to confirm risky actions
@@ -114,28 +114,33 @@ module Ironfan
       ui.info ''
     end
 
-    def bootstrapper(server, hostname)
+    def bootstrapper(computer)
+      server = computer.server
+      cloud = server.selected_cloud
+      hostname = computer.machine.dns_name
+
       bootstrap = Chef::Knife::Bootstrap.new
       bootstrap.config.merge!(config)
 
       bootstrap.name_args               = [ hostname ]
-      bootstrap.config[:node]           = server
-      bootstrap.config[:run_list]       = server.combined_run_list
-      bootstrap.config[:ssh_user]       = config[:ssh_user]       || server.cloud.ssh_user
+      bootstrap.config[:computer]       = computer
+      bootstrap.config[:server]         = server
+      bootstrap.config[:run_list]       = server.run_list
+      bootstrap.config[:ssh_user]       = config[:ssh_user]       || cloud.ssh_user
       bootstrap.config[:attribute]      = config[:attribute]
-      bootstrap.config[:identity_file]  = config[:identity_file]  || server.cloud.ssh_identity_file
-      bootstrap.config[:distro]         = config[:distro]         || server.cloud.bootstrap_distro
+      bootstrap.config[:identity_file]  = config[:identity_file]  || computer.ssh_identity_file
+      bootstrap.config[:distro]         = config[:distro]         || cloud.bootstrap_distro
       bootstrap.config[:use_sudo]       = true unless config[:use_sudo] == false
       bootstrap.config[:chef_node_name] = server.fullname
-      bootstrap.config[:client_key]     = server.client_key.body  if server.client_key.body
+      bootstrap.config[:client_key]     = ( computer.client.private_key rescue nil )
 
       bootstrap
     end
 
-    def run_bootstrap(node, hostname)
-      bs = bootstrapper(node, hostname)
+    def run_bootstrap(computer)
+      bs = bootstrapper(computer)
       if config[:skip].to_s == 'true'
-        ui.info "Skipping: bootstrap #{hostname} with #{JSON.pretty_generate(bs.config)}"
+        ui.info "Skipping: bootstrap #{computer.name} with #{JSON.pretty_generate(bs.config)}"
         return
       end
       begin
@@ -144,7 +149,7 @@ module Ironfan
         ui.warn e
         ui.warn e.backtrace
         ui.warn ""
-        ui.warn node.inspect
+        ui.warn computer.inspect
         ui.warn ""
       end
     end

data/lib/ironfan/broker/computer.rb

@@ -110,6 +110,18 @@ module Ironfan
         end
       end
 
+      def chef_client_script_content
+        cloud = server.selected_cloud
+        return @chef_client_script_content if @chef_client_script_content
+        return unless cloud.chef_client_script
+        script_filename = File.expand_path("../../../config/#{cloud.chef_client_script}", File.dirname(File.realdirpath(__FILE__)))
+        @chef_client_script_content = Ironfan.safely{ File.read(script_filename) }
+      end
+
+      def ssh_identity_file
+        resources[:key_pair].key_filename
+      end
+
 #       def ensure_resource(type)
 #         if type.multiple?
 #           existing = resources[type.resource_id]

data/lib/ironfan/provider/ec2/machine.rb

@@ -89,6 +89,10 @@ module Ironfan
           values
         end
 
+        def ssh_key
+          keypair = cloud.keypair || computer.server.cluster_name
+        end
+
         #
         # Discovery
         #

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.0.8
+  version: 4.0.9
 platform: ruby
 authors: 
 - Infochimps
@@ -232,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2934265328136200700
+      hash: 2386087126154656208
       segments: 
       - 0
       version: "0"