ironfan 5.0.11 → 6.0.0

data/ironfan.gemspec

@@ -1,230 +1,33 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'ironfan/version'
 
-Gem::Specification.new do |s|
-  s.name = "ironfan"
-  s.version = "5.0.11"
+Gem::Specification.new do |gem|
+  gem.name          = 'ironfan'
+  gem.version       = Ironfan::VERSION
+  gem.authors       = %w[ Infochimps ]
+  gem.email         = 'coders@infochimps.com'
+  gem.homepage      = 'http://infochimps.com/labs'
+  gem.licenses      = %w[ apachev2 ]
+  gem.summary       = "Infochimps' lightweight cloud orchestration toolkit, built on top of Chef."
+  gem.description   = <<-DESC.gsub(/^ {4}/, '').chomp
+    Ironfan allows you to orchestrate not just systems, but clusters of machines.
+    It includes a powerful layer on top of knife and a collection of cloud cookbooks.
+  DESC
+  gem.files         = `git ls-files`.split($/)
+  gem.test_files    = gem.files.grep(/^spec/)
+  gem.require_paths = %w[ lib ]
+    
+  gem.add_dependency('chef',       '10.30.4')
+  gem.add_dependency('fog',        '1.10.1')
+  gem.add_dependency('excon',      '0.21.0')
+  gem.add_dependency('formatador', '0.2.4')
+  gem.add_dependency('gorillib',   '0.5.0')
+  gem.add_dependency('rbvmomi',    '1.8.1')
+  gem.add_dependency('diff-lcs',   '1.2.5')
+  gem.add_dependency('json',       '1.5.4')
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Infochimps"]
-  s.date = "2014-04-02"
-  s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
-  s.email = "coders@infochimps.com"
-  s.extra_rdoc_files = [
-    "LICENSE.md",
-    "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-    ".rspec",
-    ".yardopts",
-    "CHANGELOG.md",
-    "ELB.md",
-    "Gemfile",
-    "Gemfile.lock",
-    "Guardfile",
-    "LICENSE.md",
-    "README.md",
-    "Rakefile",
-    "TODO.md",
-    "VERSION",
-    "chefignore",
-    "config/client.rb",
-    "config/knife.bash",
-    "config/knife.bash.README.md",
-    "config/proxy.pac",
-    "config/ubuntu10.04-ironfan.erb",
-    "config/ubuntu12.04-ironfan.erb",
-    "ironfan.gemspec",
-    "lib/chef/knife/bootstrap/centos6.2-ironfan.erb",
-    "lib/chef/knife/bootstrap/chef-full-ironfan.erb",
-    "lib/chef/knife/bootstrap/rhel6.3-ironfan.erb",
-    "lib/chef/knife/bootstrap/ubuntu10.04-ironfan.erb",
-    "lib/chef/knife/bootstrap/ubuntu12.04-ironfan.erb",
-    "lib/chef/knife/cluster_bootstrap.rb",
-    "lib/chef/knife/cluster_diff.rb",
-    "lib/chef/knife/cluster_kick.rb",
-    "lib/chef/knife/cluster_kill.rb",
-    "lib/chef/knife/cluster_launch.rb",
-    "lib/chef/knife/cluster_list.rb",
-    "lib/chef/knife/cluster_proxy.rb",
-    "lib/chef/knife/cluster_pry.rb",
-    "lib/chef/knife/cluster_show.rb",
-    "lib/chef/knife/cluster_ssh.rb",
-    "lib/chef/knife/cluster_start.rb",
-    "lib/chef/knife/cluster_stop.rb",
-    "lib/chef/knife/cluster_sync.rb",
-    "lib/chef/knife/environment_from_realm.rb",
-    "lib/chef/knife/ironfan_knife_common.rb",
-    "lib/chef/knife/ironfan_script.rb",
-    "lib/gorillib/diff.rb",
-    "lib/gorillib/nil_check_delegate.rb",
-    "lib/gorillib/resolution.rb",
-    "lib/ironfan.rb",
-    "lib/ironfan/broker.rb",
-    "lib/ironfan/broker/computer.rb",
-    "lib/ironfan/broker/drive.rb",
-    "lib/ironfan/builder.rb",
-    "lib/ironfan/deprecated.rb",
-    "lib/ironfan/dsl.rb",
-    "lib/ironfan/dsl/cloud.rb",
-    "lib/ironfan/dsl/cluster.rb",
-    "lib/ironfan/dsl/component.rb",
-    "lib/ironfan/dsl/compute.rb",
-    "lib/ironfan/dsl/ec2.rb",
-    "lib/ironfan/dsl/facet.rb",
-    "lib/ironfan/dsl/rds.rb",
-    "lib/ironfan/dsl/realm.rb",
-    "lib/ironfan/dsl/role.rb",
-    "lib/ironfan/dsl/server.rb",
-    "lib/ironfan/dsl/virtualbox.rb",
-    "lib/ironfan/dsl/volume.rb",
-    "lib/ironfan/dsl/vsphere.rb",
-    "lib/ironfan/headers.rb",
-    "lib/ironfan/plugin/base.rb",
-    "lib/ironfan/provider.rb",
-    "lib/ironfan/provider/chef.rb",
-    "lib/ironfan/provider/chef/client.rb",
-    "lib/ironfan/provider/chef/node.rb",
-    "lib/ironfan/provider/chef/role.rb",
-    "lib/ironfan/provider/ec2.rb",
-    "lib/ironfan/provider/ec2/ebs_volume.rb",
-    "lib/ironfan/provider/ec2/elastic_ip.rb",
-    "lib/ironfan/provider/ec2/elastic_load_balancer.rb",
-    "lib/ironfan/provider/ec2/iam_server_certificate.rb",
-    "lib/ironfan/provider/ec2/keypair.rb",
-    "lib/ironfan/provider/ec2/machine.rb",
-    "lib/ironfan/provider/ec2/placement_group.rb",
-    "lib/ironfan/provider/ec2/security_group.rb",
-    "lib/ironfan/provider/rds.rb",
-    "lib/ironfan/provider/rds/machine.rb",
-    "lib/ironfan/provider/rds/security_group.rb",
-    "lib/ironfan/provider/virtualbox.rb",
-    "lib/ironfan/provider/virtualbox/machine.rb",
-    "lib/ironfan/provider/vsphere.rb",
-    "lib/ironfan/provider/vsphere/keypair.rb",
-    "lib/ironfan/provider/vsphere/machine.rb",
-    "lib/ironfan/requirements.rb",
-    "notes/Future-development-proposals.md",
-    "notes/Home.md",
-    "notes/INSTALL-cloud_setup.md",
-    "notes/INSTALL.md",
-    "notes/Ironfan-Roadmap.md",
-    "notes/Upgrading-to-v4.md",
-    "notes/advanced-superpowers.md",
-    "notes/aws_servers.jpg",
-    "notes/aws_user_key.png",
-    "notes/cookbook-versioning.md",
-    "notes/core_concepts.md",
-    "notes/declaring_volumes.md",
-    "notes/design_notes-aspect_oriented_devops.md",
-    "notes/design_notes-ci_testing.md",
-    "notes/design_notes-cookbook_event_ordering.md",
-    "notes/design_notes-meta_discovery.md",
-    "notes/ec2-pricing_and_capacity.md",
-    "notes/ec2-pricing_and_capacity.numbers",
-    "notes/homebase-layout.txt",
-    "notes/knife-cluster-commands.md",
-    "notes/named-cloud-objects.md",
-    "notes/opscode_org_key.png",
-    "notes/opscode_user_key.png",
-    "notes/philosophy.md",
-    "notes/rake_tasks.md",
-    "notes/renamed-recipes.txt",
-    "notes/silverware.md",
-    "notes/style_guide.md",
-    "notes/tips_and_troubleshooting.md",
-    "notes/walkthrough-hadoop.md",
-    "notes/walkthrough-web.md",
-    "spec/chef/cluster_bootstrap_spec.rb",
-    "spec/chef/cluster_launch_spec.rb",
-    "spec/fixtures/ec2/elb/snakeoil.crt",
-    "spec/fixtures/ec2/elb/snakeoil.key",
-    "spec/fixtures/gunbai.rb",
-    "spec/fixtures/gunbai_slice.json",
-    "spec/fixtures/knife/knife.rb",
-    "spec/integration/minimal-chef-repo/chefignore",
-    "spec/integration/minimal-chef-repo/environments/_default.json",
-    "spec/integration/minimal-chef-repo/knife/credentials/knife-org.rb",
-    "spec/integration/minimal-chef-repo/knife/knife.rb",
-    "spec/integration/minimal-chef-repo/roles/systemwide.rb",
-    "spec/integration/spec/elb_build_spec.rb",
-    "spec/integration/spec/simple_cluster_spec.rb",
-    "spec/integration/spec_helper.rb",
-    "spec/integration/spec_helper/launch_cluster.rb",
-    "spec/ironfan/cluster_spec.rb",
-    "spec/ironfan/diff_spec.rb",
-    "spec/ironfan/dsl_spec.rb",
-    "spec/ironfan/ec2/cloud_provider_spec.rb",
-    "spec/ironfan/ec2/elb_spec.rb",
-    "spec/ironfan/ec2/security_group_spec.rb",
-    "spec/ironfan/manifest_spec.rb",
-    "spec/ironfan/plugin_spec.rb",
-    "spec/ironfan/realm_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/spec_helper/dummy_chef.rb",
-    "spec/spec_helper/dummy_diff_drawer.rb",
-    "spec/test_config.rb",
-    "tasks/chef_config.rake"
-  ]
-  s.homepage = "http://infochimps.com/labs"
-  s.licenses = ["apachev2"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
-  s.summary = "Infochimps' lightweight cloud orchestration toolkit, built on top of Chef."
-  s.test_files = ["spec/chef/cluster_bootstrap_spec.rb", "spec/chef/cluster_launch_spec.rb", "spec/fixtures/ec2/elb/snakeoil.crt", "spec/fixtures/ec2/elb/snakeoil.key", "spec/fixtures/gunbai.rb", "spec/fixtures/gunbai_slice.json", "spec/fixtures/knife/knife.rb", "spec/integration/minimal-chef-repo/chefignore", "spec/integration/minimal-chef-repo/environments/_default.json", "spec/integration/minimal-chef-repo/knife/credentials/knife-org.rb", "spec/integration/minimal-chef-repo/knife/knife.rb", "spec/integration/minimal-chef-repo/roles/systemwide.rb", "spec/integration/spec/elb_build_spec.rb", "spec/integration/spec/simple_cluster_spec.rb", "spec/integration/spec_helper/launch_cluster.rb", "spec/integration/spec_helper.rb", "spec/ironfan/cluster_spec.rb", "spec/ironfan/diff_spec.rb", "spec/ironfan/dsl_spec.rb", "spec/ironfan/ec2/cloud_provider_spec.rb", "spec/ironfan/ec2/elb_spec.rb", "spec/ironfan/ec2/security_group_spec.rb", "spec/ironfan/manifest_spec.rb", "spec/ironfan/plugin_spec.rb", "spec/ironfan/realm_spec.rb", "spec/spec_helper/dummy_chef.rb", "spec/spec_helper/dummy_diff_drawer.rb", "spec/spec_helper.rb", "spec/test_config.rb"]
+  gem.add_development_dependency('bundler', '~> 1.0')
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<chef>, ["~> 10.16"])
-      s.add_runtime_dependency(%q<fog>, ["~> 1.2"])
-      s.add_runtime_dependency(%q<excon>, ["~> 0.21.0"])
-      s.add_runtime_dependency(%q<formatador>, ["~> 0.2"])
-      s.add_runtime_dependency(%q<gorillib>, ["~> 0.5.0"])
-      s.add_runtime_dependency(%q<rbvmomi>, [">= 0"])
-      s.add_runtime_dependency(%q<diff-lcs>, ["~> 1.2.5"])
-      s.add_runtime_dependency(%q<json>, ["= 1.5.4"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8"])
-      s.add_development_dependency(%q<yard>, [">= 0.7"])
-      s.add_development_dependency(%q<redcarpet>, [">= 2.1"])
-      s.add_development_dependency(%q<oj>, [">= 1.2"])
-    else
-      s.add_dependency(%q<chef>, ["~> 10.16"])
-      s.add_dependency(%q<fog>, ["~> 1.2"])
-      s.add_dependency(%q<excon>, ["~> 0.21.0"])
-      s.add_dependency(%q<formatador>, ["~> 0.2"])
-      s.add_dependency(%q<gorillib>, ["~> 0.5.0"])
-      s.add_dependency(%q<rbvmomi>, [">= 0"])
-      s.add_dependency(%q<diff-lcs>, ["~> 1.2.5"])
-      s.add_dependency(%q<json>, ["= 1.5.4"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.8"])
-      s.add_dependency(%q<yard>, [">= 0.7"])
-      s.add_dependency(%q<redcarpet>, [">= 2.1"])
-      s.add_dependency(%q<oj>, [">= 1.2"])
-    end
-  else
-    s.add_dependency(%q<chef>, ["~> 10.16"])
-    s.add_dependency(%q<fog>, ["~> 1.2"])
-    s.add_dependency(%q<excon>, ["~> 0.21.0"])
-    s.add_dependency(%q<formatador>, ["~> 0.2"])
-    s.add_dependency(%q<gorillib>, ["~> 0.5.0"])
-    s.add_dependency(%q<rbvmomi>, [">= 0"])
-    s.add_dependency(%q<diff-lcs>, ["~> 1.2.5"])
-    s.add_dependency(%q<json>, ["= 1.5.4"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.8"])
-    s.add_dependency(%q<yard>, [">= 0.7"])
-    s.add_dependency(%q<redcarpet>, [">= 2.1"])
-    s.add_dependency(%q<oj>, [">= 1.2"])
-  end
 end
-

data/lib/chef/cluster_knife.rb

@@ -0,0 +1,26 @@
+require 'chef/knife'
+require 'chef/knife/bootstrap'
+require 'chef/knife/ssh'
+require 'gorillib/model/serialization'
+require 'yaml'
+
+require 'chef/knife/ironfan_knife_common'
+require 'chef/knife/ironfan_script'
+
+class Chef
+  class Knife
+    autoload :ClusterBootstrap, 'chef/knife/cluster_bootstrap'
+    autoload :ClusterDiff,      'chef/knife/cluster_diff'
+    autoload :ClusterKick,      'chef/knife/cluster_kick'
+    autoload :ClusterKill,      'chef/knife/cluster_kill'
+    autoload :ClusterLaunch,    'chef/knife/cluster_launch'
+    autoload :ClusterList,      'chef/knife/cluster_list'    
+    autoload :ClusterProxy,     'chef/knife/cluster_proxy'
+    autoload :ClusterPry,       'chef/knife/cluster_pry'
+    autoload :ClusterShow,      'chef/knife/cluster_show'
+    autoload :ClusterSsh,       'chef/knife/cluster_ssh'
+    autoload :ClusterStart,     'chef/knife/cluster_start'
+    autoload :ClusterStop,      'chef/knife/cluster_stop'
+    autoload :ClusterSync,      'chef/knife/cluster_sync'
+  end
+end

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

@@ -14,6 +14,13 @@ set -e
 
 <%= (@config[:verbosity].to_i > 1 ? 'set -v' : '') %>
 
+echo "deb http://apt.opscode.com/ `lsb_release -cs`-0.10 main" | sudo tee /etc/apt/sources.list.d/opscode.list
+
+# Make sure that opscode chef is on the apt repo list.
+sudo mkdir -p /etc/apt/trusted.gpg.d
+gpg --keyserver keys.gnupg.net --recv-keys 83EF826A
+gpg --export packages@opscode.com | sudo tee /etc/apt/trusted.gpg.d/opscode-keyring.gpg > /dev/null
+
 date > /etc/box_build_time
 
 echo -e "`date` \n\n**** \n**** apt update:\n****\n"

data/lib/chef/knife/cluster_bootstrap.rb

@@ -15,9 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-require File.expand_path('ironfan_script', File.dirname(File.realdirpath(__FILE__)))
-require 'chef/knife/bootstrap'
+require_relative '../cluster_knife'
 
 class Chef
   class Knife

data/lib/chef/knife/cluster_diff.rb

@@ -1,8 +1,3 @@
-require 'gorillib/model/serialization'
-require 'gorillib/nil_check_delegate'
-require 'yaml'
-require_relative '../../gorillib/diff'
-
 #
 # Author:: Philip (flip) Kromer (<flip@infochimps.com>)
 # Copyright:: Copyright (c) 2011 Infochimps, Inc
@@ -20,14 +15,13 @@ require_relative '../../gorillib/diff'
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-require File.expand_path('ironfan_knife_common', File.dirname(File.realdirpath(__FILE__)))
-require 'yaml'
+require_relative '../cluster_knife'
 
 class Chef
   class Knife
     class ClusterDiff < Knife
       include Ironfan::KnifeCommon
+
       deps do
         Ironfan::KnifeCommon.load_deps
       end

data/lib/chef/knife/cluster_kick.rb

@@ -15,9 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-require File.expand_path('ironfan_knife_common', File.dirname(File.realdirpath(__FILE__)))
-require File.expand_path('cluster_ssh',          File.dirname(File.realdirpath(__FILE__)))
+require_relative '../cluster_knife'
 
 class Chef
   class Knife

data/lib/chef/knife/cluster_kill.rb

@@ -15,8 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-require File.expand_path('ironfan_script', File.dirname(File.realdirpath(__FILE__)))
+require_relative '../cluster_knife'
 
 class Chef
   class Knife

data/lib/chef/knife/cluster_launch.rb

@@ -15,9 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-require File.expand_path('ironfan_knife_common', File.dirname(File.realdirpath(__FILE__)))
-require File.expand_path('cluster_bootstrap',    File.dirname(File.realdirpath(__FILE__)))
+require_relative '../cluster_knife'
 
 class Chef
   class Knife
@@ -48,12 +46,22 @@ class Chef
         :description => "Perform launch operations even if it may not be safe to do so. Default false",
         :boolean     => true,
         :default     => false
-
       option :bootstrap,
         :long        => "--[no-]bootstrap",
         :description => "Also bootstrap the launched machine (default is NOT to bootstrap)",
         :boolean     => true,
         :default     => false
+      option :cloud,
+        long:        "--[no-]cloud",
+        description: "Look up computers on AWS cloud (default is yes, look up computers; use --no-cloud to skip)",
+        default:     true,
+        boolean:     true
+
+      option :wait_ssh,
+        :long        => "--[no-]wait-ssh",
+        :description => "Wait for the target machine to open an ssh port",
+        :boolean     => true,
+        :default     => true
 
       def _run
         load_ironfan
@@ -69,7 +77,7 @@ class Chef
 
         warn_or_die_on_bogus_servers(full_target) unless full_target.select(&:bogus?).empty?
 
-        die("", "#{ui.color("All computers are running -- not launching any.",:blue)}", "", 1) if target.empty?
+        die("", "#{ui.color("All computers are running -- not launching any.",:blue)}", "", 0) if target.empty?
 
         # If a bootstrap was requested, ensure that we will be able to perform the
         # bootstrap *before* trying to launch all of the servers in target. This
@@ -110,10 +118,10 @@ class Chef
       def perform_after_launch_tasks(computer)
         # Try SSH
         unless config[:dry_run]
-          Ironfan.step(computer.name, 'trying ssh', :white)
-          # FIXME: This is EC2-specific, abstract it
-          address = computer.machine.vpc_id.nil? ? computer.machine.public_hostname : computer.machine.public_ip_address
-          nil until tcp_test_ssh(address){ sleep @initial_sleep_delay ||= 10  }
+          if config[:wait_ssh]
+            Ironfan.step(computer.name, 'trying ssh', :white)
+            nil until wait_for_ssh(computer){ sleep @initial_sleep_delay ||= 10  }
+          end
         end
         
         # Run Bootstrap
@@ -123,31 +131,6 @@ class Chef
         end
       end
 
-      def tcp_test_ssh(target)
-        tcp_socket = TCPSocket.new(target, 22)
-        readable = IO.select([tcp_socket], nil, nil, 5)
-        if readable
-          Chef::Log.debug("sshd accepting connections on #{target}, banner is #{tcp_socket.gets}")
-          yield
-          true
-        else
-          false
-        end
-      rescue Errno::ETIMEDOUT
-	Chef::Log.debug("ssh to #{target} timed out")
-        false
-      rescue Errno::ECONNREFUSED
-	Chef::Log.debug("ssh connection to #{target} refused")
-        sleep 2
-        false
-      rescue Errno::EHOSTUNREACH
-	Chef::Log.debug("ssh host #{target} unreachable")
-        sleep 2
-        false
-      ensure
-        tcp_socket && tcp_socket.close
-      end
-
       def warn_or_die_on_bogus_servers(target)
         ui.info("")
         ui.info "Cluster has servers in a transitional or undefined state (shown as 'bogus'):"

data/lib/chef/knife/cluster_list.rb

@@ -15,8 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-require File.expand_path('ironfan_knife_common', File.dirname(File.realdirpath(__FILE__)))
+require_relative '../cluster_knife'
 
 class Chef
   class Knife
@@ -39,19 +38,21 @@ class Chef
       def _run
         load_ironfan
         configure_dry_run
-        Ironfan.load_cluster_files
+        Ironfan.dsl_files(Ironfan.clusters_dir).each{ |f| Ironfan.load_dsl_file f }
 
         data = Ironfan.clusters.values.map do |cluster|
           name, path = [cluster.name, cluster.source_file]
           as_table = { :cluster => name, :path => path }
           if config[:facets]
-            facets = Ironfan.load_cluster(name).facets.to_a.map(&:name).join(', ')
+            facets = Ironfan.load_cluster(name).facets.to_a.map do |facet|
+              "#{facet.name}(#{facet.instances})"
+            end.join(', ')
             as_table.merge!(:facets => facets)
           end
           as_table
         end
 
-        ui.info "Cluster Path: #{ Ironfan.cluster_path.join ", " }"
+        ui.info "Cluster Path: #{ Ironfan.clusters_dir.join ", " }"
         headers = config[:facets] ? [:cluster, :facets, :path] : [:cluster, :path] 
         Formatador.display_compact_table(data, headers)
       end

data/lib/chef/knife/cluster_proxy.rb

@@ -15,9 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-require File.expand_path('ironfan_script', File.dirname(File.realdirpath(__FILE__)))
-require File.expand_path('cluster_ssh',    File.dirname(File.realdirpath(__FILE__)))
+require_relative '../cluster_knife'
 
 class Chef
   class Knife

data/lib/chef/knife/cluster_pry.rb

@@ -15,8 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-require File.expand_path('ironfan_knife_common', File.dirname(File.realdirpath(__FILE__)))
+require_relative '../cluster_knife'
 
 class Chef
   class Knife

data/lib/chef/knife/cluster_show.rb

@@ -15,14 +15,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-require File.expand_path('ironfan_knife_common', File.dirname(File.realdirpath(__FILE__)))
-require 'yaml'
+require_relative '../cluster_knife'
 
 class Chef
   class Knife
     class ClusterShow < Knife
       include Ironfan::KnifeCommon
+
       deps do
         Ironfan::KnifeCommon.load_deps
       end
@@ -30,10 +29,10 @@ class Chef
       banner "knife cluster show        CLUSTER[-FACET[-INDEXES]] (options) - a helpful display of cluster's cloud and chef state"
 
       option :cloud,
-        :long        => "--[no-]cloud",
-        :description => "Look up computers on AWS cloud (default is yes, look up computers; use --no-cloud to skip)",
-        :default     => true,
-        :boolean     => true
+        long:        "--[no-]cloud",
+        description: "Look up computers on AWS cloud (default is yes, look up computers; use --no-cloud to skip)",
+        default:     true,
+        boolean:     true
 
       def _run
         with_verbosity(1){ config[:include_terminated] = true }

data/lib/chef/knife/cluster_ssh.rb

@@ -15,9 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-require File.expand_path('ironfan_knife_common', File.dirname(File.realdirpath(__FILE__)))
-require 'chef/knife/ssh'
+require_relative '../cluster_knife'
 
 class Chef
   class Knife
@@ -53,13 +51,17 @@ class Chef
 
         (ui.fatal("No nodes returned from search!"); exit 10) if addresses.nil? || addresses.length == 0
 
-        @hostname_to_ironfan_hostname = Hash[
-          target.map do |c|
-            [c.machine.public_hostname, c.machine.tags['Name']]
-          end
-        ]
+        # Need to include both public host and public ip; sometimes these are different
+        @hostname_to_ironfan_hostname = target.to_a.inject({}) do |remap, c|
+          remap[c.machine.public_hostname]   = c.machine.tags['Name'] || c.name
+          remap[c.machine.public_ip_address] = c.machine.tags['Name'] || c.name
+          remap
+        end
+
         @longest_ironfan_hostname = @hostname_to_ironfan_hostname.values.group_by(&:size).max.last[0].size
 
+        @action_nodes = Chef::Search::Query.new.search(:node, "node_name:#{@name_args[0]}*")[0]
+
         session_from_list(addresses)
       end
 

data/lib/chef/knife/cluster_start.rb

@@ -15,8 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-require File.expand_path('ironfan_script',       File.dirname(File.realdirpath(__FILE__)))
+require_relative '../cluster_knife'
 
 class Chef
   class Knife

data/lib/chef/knife/cluster_stop.rb

@@ -15,8 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-require File.expand_path('ironfan_script', File.dirname(File.realdirpath(__FILE__)))
+require_relative '../cluster_knife'
 
 class Chef
   class Knife

data/lib/chef/knife/cluster_sync.rb

@@ -15,8 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-require File.expand_path('ironfan_script', File.dirname(File.realdirpath(__FILE__)))
+require_relative '../cluster_knife'
 
 class Chef
   class Knife
@@ -46,7 +45,7 @@ class Chef
         computer.created? or computer.node?
       end
 
-      def perform_execution(target)
+      def perform_execution target
         if config[:chef]
           if config[:dry_run]
             ui.info "(can't do a dry-run when syncing to chef -- skipping)"