ironfan 3.1.0.rc1 → 3.1.1

data/.yardopts

@@ -0,0 +1,5 @@
+VERSION
+CHANGELOG.md
+LICENSE.md
+README.md
+notes/*

data/CHANGELOG.md

@@ -1,15 +1,28 @@
-# v3.1.0-rc1
+# v3.1.1: I am Ironfan danananananabumbumbum
 
 * 'ClusterChef has been renamed 'Ironfan'
 * The 'Metachef' cookbook has been renamed 'Silverware'
 * The 'Minidash' cookbook has been renamed 'Minidash'
 
-Please be sure you do a 
+You should reload your chef server:
 
-    knife cookbook delete metachef minidash
+    knife cookbook delete metachef dashpot
     knife cookbook upload --all
+    rake roles
+
+* You can now launch a cluster locally with vagrant!
+  - follow the instructions in [ironfan-ci](https://github.com/infochimps-labs/ironfan-ci/blob/master/README-install.md)
+  - set up a credentials set for your local machine (`cp -rp knife/example-credentials knife/local-credentials ; ln -nfs local-credentials knife/credentials`)
+  - customize its `knife-org.rb` for your chef server
+  - `knife cluster vagrant up sandbox-simple`
+
+* Deprecated 'knife cluster foo nikko web 0' (many args) in favor of 'knife cluster foo nikko-web-0' (single arg). 
+  - the latter still works, it just yells a lot.
+  
+* Am changing `--no-cloud` and `--no-chef` to `--cloud=false` and `--chef=false`, opening up room for a later `--cloud=rackspace` etc.
+
+* many doc fixes, thanks @sya!
 
-These renames unfortunately hit every cookbook that depends on (what is now) silverware.
 
 __________________________________________________________________________
 __________________________________________________________________________
@@ -18,7 +31,7 @@ __________________________________________________________________________
 
 Big important change:
 
-# Ironfan is now Ironfan
+# ClusterChef is now Ironfan
 
 Due to a polite request from outside, we are changing this project's name to not include the word 'Chef'.
 

data/README.md

@@ -1,4 +1,32 @@
-# ironfan
+# Ironfan Core: knife tools and core models
+
+The ironfan project is an expressive toolset for constructing scalable, resilient architectures. It works in the cloud, in the data center, and on your laptop, and makes your system diagram visible and inevitable.
+
+This repo implements
+
+* core models to describe your system diagram with a clean, expressive domain-specific language
+* knife plugins to orchestrate clusters of machines using simple commands like `knife cluster launch`
+* logic to coordinate truth among chef server and cloud providers.
+
+To get started with ironfan, clone the [homebase repo](https://github.com/infochimps-labs/ironfan-homebase) and follow the [installation instructions](https://github.com/infochimps-labs/ironfan/wiki/install). Please file all issues on [ironfan issues](https://github.com/infochimps-labs/ironfan/issues).
+
+## Index
+
+ironfan core works together with the full ironfan toolset:
+
+* [ironfan-homebase](https://github.com/infochimps-labs/ironfan-homebase): centralizes the cookbooks, roles and clusters. A solid foundation for any chef user.
+* [ironfan gem](https://github.com/infochimps-labs/ironfan): core ironfan models, and knife plugins to orchestrate machines and coordinate truth among you homebase, cloud and chef server.
+* [ironfan-pantry](https://github.com/infochimps-labs/ironfan-pantry): Our collection of industrial-strength, cloud-ready recipes for Hadoop, HBase, Cassandra, Elasticsearch, Zabbix and more.
+* [silverware cookbook](https://github.com/infochimps-labs/ironfan-homebase/tree/master/cookbooks/silverware): coordinate discovery of services ("list all the machines for `awesome_webapp`, that I might load balance them") and aspects ("list all components that write logs, that I might logrotate them, or that I might monitor the free space on their volumes".
+* [ironfan-ci](https://github.com/infochimps-labs/ironfan-ci): Continuous integration testing of not just your cookbooks but your *architecture*.
+
+* [ironfan wiki](https://github.com/infochimps-labs/ironfan/wiki): high-level documentation and install instructions
+* [ironfan issues](https://github.com/infochimps-labs/ironfan/issues): bugs, questions and feature requests for *any* part of the ironfan toolset.
+* [ironfan gem docs](http://rdoc.info/gems/ironfan): rdoc docs for ironfan
+
+__________________________________________________________________________
+
+# Ironfan
 
 Infrastructure as code: describe and orchestrate whole clusters of cloud or virtual machines. 
 
@@ -174,41 +202,7 @@ With these simple settings, if you have already [set up chef's knife to launch c
 
 ## Getting Started
 
-This assumes you have installed chef, have a working chef server, and have an AWS account. If you can run knife and use the web browser to see your EC2 console, you can start here. If not, see the instructions below.
-
-### Setup
-
-```ruby
-bundle install
-```
-
-### Your first cluster
-
-Let's create a cluster called 'demosimple'. It's, well, a simple demo cluster.
-
-#### Create a simple demo cluster
-
-Create a directory for your clusters; copy the demosimple cluster and its associated roles from ironfan:
-
-```ruby
-        mkdir -p $CHEF_REPO_DIR/clusters
-        cp ironfan/clusters/{defaults,demosimple}.rb ./clusters/
-        cp ironfan/roles/{big_package,nfs_*,ssh,base_role,chef_client}.rb  ./roles/
-```
-
-Lastly, add the `cookbooks`, `site-cookbooks`, and `meta-cookbooks` directories
-from ironfan to the `cookbooks_path` in your knife.rb, and push everything
-to the chef server. (see below for details).
-
-#### knife cluster launch
-
-Hooray! You're ready to launch a cluster:
-
-```ruby
-    knife cluster launch demosimple homebase --bootstrap
-```
-
-It will kick off a node and then bootstrap it. You'll see it install a whole bunch of things. Yay.
+@sya add the contents of https://github.com/infochimps-labs/ironfan/wiki/INSTALL here
 
 __________________________________________________________________________
 
@@ -235,19 +229,6 @@ __________________________________________________________________________
 
 ## Advanced Superpowers
 
-#### Auto-vivifying machines (no bootstrap required!)
-
-On EC2, you can make a machine that auto-vivifies -- no bootstrap necessary. Burn an AMI that has the `config/client.rb` file in /etc/chef/client.rb. It will use the ec2 userdata (passed in by knife) to realize its purpose in life, its identity, and the chef server to connect to; everything happens automagically from there. No parallel ssh required!
-
-#### EBS Volumes
-
-Define a `snapshot_id` for your volumes, and set `create_at_launch` true.
-
-__________________________________________________________________________
-
-
-## Extended Installation Notes
-
 #### Set up Knife on your local machine, and a Chef Server in the cloud
 
 If you already have a working chef installation you can skip this section.
@@ -257,72 +238,10 @@ To get started with knife and chef, follow the "Chef Quickstart,":http://wiki.op
 * [Launch Cloud Instances with Knife](http://wiki.opscode.com/display/chef/Launch+Cloud+Instances+with+Knife)
 * [EC2 Bootstrap Fast Start Guide](http://wiki.opscode.com/display/chef/EC2+Bootstrap+Fast+Start+Guide)
 
-#### Cloud setup
-
-Next,
-
-* sign up for an AWS account
-* Follow the "Knife with AWS quickstart": on the opscode wiki.
-
-Right now cluster chef works well with AWS.  If you're interested in modifying it to work with other cloud providers, "see here":https://github.com/infochimps-labs/ironfan/issues/28 or get in touch.
-
-#### Knife setup
-
-In your `.chef/knife.rb`, modify the cookbook path to include ironfan's `cookbooks`, `meta-cookbooks` and `site-cookbooks`, and to add settings for `ironfan_path`, `cluster_path` and `keypair_path`. Here's mine:
-
-```
-        current_dir = File.dirname(__FILE__)
-        organization  = 'CHEF_ORGANIZATION'
-        username      = 'CHEF_USERNAME'
-
-        # The full path to your ironfan installation
-        ironfan_path File.expand_path("#{current_dir}/../ironfan")
-        # The list of paths holding clusters
-        cluster_path      [ File.expand_path("#{current_dir}/../clusters") ]
-        # The directory holding your cloud keypairs
-        keypair_path      File.expand_path(current_dir)
-
-        log_level                :info
-        log_location             STDOUT
-        node_name                username
-        client_key               "#{keypair_path}/#{username}.pem"
-        validation_client_name   "#{organization}-validator"
-        validation_key           "#{keypair_path}/#{organization}-validator.pem"
-        chef_server_url          "https://api.opscode.com/organizations/#{organization}"
-        cache_type               'BasicFile'
-        cache_options( :path => "#{ENV['HOME']}/.chef/checksums" )
-
-        # The first things have lowest priority (so, site-cookbooks gets to win)
-        cookbook_path            [
-          "#{ironfan_path}/cookbooks",      # std cookbooks from opscode/cookbooks
-          "#{ironfan_path}/meta-cookbooks", # coordinate services among cookbooks
-          "#{ironfan_path}/site-cookbooks", # infochimps' collection of cookbooks
-          "#{current_dir}/../cookbooks",         
-          "#{current_dir}/../site-cookbooks",    # your internal cookbooks
-        ]
-
-        # If you primarily use AWS cloud services:
-        knife[:ssh_address_attribute] = 'cloud.public_hostname'
-        knife[:ssh_user] = 'ubuntu'
-
-        # Configure bootstrapping
-        knife[:bootstrap_runs_chef_client] = true
-        bootstrap_chef_version   "~> 0.10.0"
-
-        # AWS access credentials
-        knife[:aws_access_key_id]      = "XXXXXXXXXXX"
-        knife[:aws_secret_access_key]  = "XXXXXXXXXXXXX"
-```
-
-#### Push to chef server
+#### Auto-vivifying machines (no bootstrap required!)
 
-To send all the cookbooks and role to the chef server, visit your ironfan directory and run:
+On EC2, you can make a machine that auto-vivifies -- no bootstrap necessary. Burn an AMI that has the `config/client.rb` file in /etc/chef/client.rb. It will use the ec2 userdata (passed in by knife) to realize its purpose in life, its identity, and the chef server to connect to; everything happens automagically from there. No parallel ssh required!
 
-```ruby
-        cd $CHEF_REPO_DIR
-        mkdir -p $CHEF_REPO_DIR/site-cookbooks
-        knife cookbook upload --all
-        for foo in roles/*.rb ; do knife role from file $foo & sleep 1 ; done
-```
+#### EBS Volumes
 
-You should see all the cookbooks defined in ironfan/cookbooks (ant, apt, ...) listed among those it uploads.
+Define a `snapshot_id` for your volumes, and set `create_at_launch` true.

data/TODO.md

@@ -1,16 +1,44 @@
-### From Nathan
-- syntactic sugar for ```server(0).fullname('blah')```
-
 ### Knife commands
 
-* knife cluster kick fails if service isn't running
-* make clear directions for installing `ironfan` and its initial use.
 * knife cluster launch should fail differently if you give it a facet that doesn't exist
 
 
+* reify notion of 'homebase'; cluster commands work off it
+* move away from referring to Chef::Config everywhere; 
+
+
+__________________________________________________________________________
+
+Rename completed, 
+
+New homes:
+
+* **http://github.com/infochimps-labs/ironfan** -- the primary destination, and the home of the knife tools (pretty much what's here in `infochimps/cluster_chef`)
+* **http://github.com/infochimps-labs/ironfan-pantry** -- collection of public cookbooks, roles and demo clusters
+* **http://github.com/infochimps-labs/ironfan-homebase** -- skeleton homebase (looks a lot like the current cluster_chef-homebase)
+* **http://github.com/infochimps-labs/ironfan-ci** -- continuous integration stuff (homebase/vagrants)
+* **http://github.com/infochimps-labs/ironfan-scrubby** -- de-linter/simulator (`cluster_chef/lib/cluster_chef/cookbook_munger*`)
+* **http://github.com/infochimps-labs/opscode-cookbooks** -- our fork of the opscode cookbooks repo
+
+## Phase 1: Regex Replace
+
+0. DONE warn about the name change. Since the `version_3` branch is left pre-namechange, decision was made to do a pull request when things are pull-able, not spam people before.
+1. DONE Make a branch in each repo (`cluster_chef` and `*-homebase`) called `before_rename`, holding the current state of the code. Make another branch `ironfan`, where the renames will occur. That branch will be deleted as soon as the merge lands, hopefully before anyone even notices.
+2. DONE Make sure `el_ridiculoso` is up to date and that it fully converges in the vagrant and cloud environments.
+3. DONE Ensure all infochimps devs have push-pulled to various repos. make a tarball of the repos (.git and everything) and put them somewhere safe.
+4. DONE rename the `vendor/infochimps/metachef` cookbook as vendor/infochimps/silverware. 
+5. DONE Bump the *minor* version number on all cookbooks (so 3.0.x => 3.1.x). Commit.
+6. DONE regex-replace `ClusterChef` => `Ironfan`, `cluster_chef` to `ironfan`  and `[Mm]etachef` => `[Ss]ilverware`. Do this in `cluster_chef` and `infochimps-labs/ironfan-homebase` only.  Get chef-client to complete on el_ridiculoso using an emptied-and-reloaded local chef server. Run knife cluster sync on all clusters in all homebases against local chef server.
+7. ...
+12. DONE once the name is updated in the gemspec, release the `ironfan` gem. @temujin9 and I agree that it should be a single combined gem now that we won't have the stupid `_chef` gem name conflict.
 
-### ssh_user, ssh_identity_file, keypair, template should be set by cluster except when they shouldn't
+## Phase 2: Repo migration
 
-### Organization-specific homebase files
+1. DONE back up the repo and put it somewhere safe.
+2. DONE Transfer ownership of `infochimps/cluster_chef` to `infochimps-labs/cluster_chef`. Do whatever is necessary/possible to migrate issues over.
+3. DONE Change name of `infochimps-labs/cluster_chef` to `infochimps-labs/ironfan`. Created new repo `infochimps-labs/ironfan-homebase`. 4. DONE Create new repo `infochimps/cluster_chef` with helpful link to new repo. I don't think we need a placeholder at `infochimps-labs/cluster_chef-homebase`.
+5. DONE Rename master branch of old cluster chef to be `version_2`, and freeze the `version_3`. Both now carry a deprecation warning pointing you to ironfan. 
+6. IN PROGRESS Update any remaining documentation links, etc to point to new home.
+7. IN PROGRESS Have all devs edit their .git/config to point at right place.
 
-The current organization of the homebase needs to better scope organization-specific customizations
+so here is the dev-level worksforme -- @temujin9 will close once he's given it the sysadmin-level worksforme

data/VERSION

@@ -1 +1 @@
-3.1.0.rc1
+3.1.1

data/cluster_chef-knife.gemspec

@@ -46,8 +46,8 @@ Gem::Specification.new do |s|
     "lib/chef/knife/cluster_start.rb",
     "lib/chef/knife/cluster_stop.rb",
     "lib/chef/knife/cluster_sync.rb",
-    "lib/chef/knife/generic_command.rb",
-    "lib/chef/knife/knife_common.rb",
+    "lib/chef/knife/ironfan_script.rb",
+    "lib/chef/knife/ironfan_knife_common.rb",
     "lib/ironfan.rb",
     "lib/ironfan/chef_layer.rb",
     "lib/ironfan/cloud.rb",
@@ -120,4 +120,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<configliere>, ["~> 0.4.8"])
   end
 end
-

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "3.1.0.rc1"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-02-18"
+  s.date = "2012-02-20"
   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 = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
     ".rspec",
+    ".yardopts",
     "CHANGELOG.md",
     "Gemfile",
     "LICENSE.md",
@@ -47,8 +48,12 @@ Gem::Specification.new do |s|
     "lib/chef/knife/cluster_start.rb",
     "lib/chef/knife/cluster_stop.rb",
     "lib/chef/knife/cluster_sync.rb",
-    "lib/chef/knife/generic_command.rb",
-    "lib/chef/knife/knife_common.rb",
+    "lib/chef/knife/cluster_vagrant.rb",
+    "lib/chef/knife/ironfan_knife_common.rb",
+    "lib/chef/knife/ironfan_script.rb",
+    "lib/chef/knife/vagrant/ironfan_environment.rb",
+    "lib/chef/knife/vagrant/ironfan_provisioners.rb",
+    "lib/chef/knife/vagrant/skeleton_vagrantfile.rb",
     "lib/ironfan.rb",
     "lib/ironfan/chef_layer.rb",
     "lib/ironfan/cloud.rb",
@@ -65,6 +70,25 @@ Gem::Specification.new do |s|
     "lib/ironfan/server.rb",
     "lib/ironfan/server_slice.rb",
     "lib/ironfan/volume.rb",
+    "notes/Home.md",
+    "notes/INSTALL-cloud_setup.md",
+    "notes/INSTALL.md",
+    "notes/Knife-Cluster-Commands.md",
+    "notes/Silverware.md",
+    "notes/aws_console_screenshot.jpg",
+    "notes/cookbook-versioning.md",
+    "notes/declaring_volumes.md",
+    "notes/design_notes-ci_testing.md",
+    "notes/design_notes-cookbook_event_ordering.md",
+    "notes/design_notes-dsl_object.md",
+    "notes/design_notes-meta_discovery.md",
+    "notes/ec2-pricing_and_capacity.md",
+    "notes/ironfan_homebase_layout.md",
+    "notes/named-cloud-objects.md",
+    "notes/rake_tasks.md",
+    "notes/renamed-recipes.txt",
+    "notes/style_guide.md",
+    "notes/tips_and_troubleshooting.md",
     "spec/ironfan/cluster_spec.rb",
     "spec/ironfan/facet_spec.rb",
     "spec/ironfan/server_slice_spec.rb",
@@ -119,3 +143,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<configliere>, ["~> 0.4.8"])
   end
 end
+

data/lib/chef/knife/cluster_bootstrap.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__)+"/generic_command.rb")
+require File.expand_path('ironfan_script', File.dirname(File.realdirpath(__FILE__)))
 require 'chef/knife/bootstrap'
 
 class Chef

data/lib/chef/knife/cluster_kick.rb

@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__)+"/knife_common.rb")
-require File.expand_path(File.dirname(__FILE__)+"/cluster_ssh.rb")
+require File.expand_path('ironfan_knife_common', File.dirname(File.realdirpath(__FILE__)))
+require File.expand_path('cluster_ssh',          File.dirname(File.realdirpath(__FILE__)))
 
 class Chef
   class Knife
@@ -35,7 +35,7 @@ class Chef
     class ClusterKick < Chef::Knife::ClusterSsh
 
       import_banner_and_options(Chef::Knife::ClusterSsh)
-      banner 'knife cluster kick "CLUSTER [FACET [INDEXES]]" (options) - start a run of chef-client on each server, tailing the logs and exiting when the run completes.'
+      banner 'knife cluster kick        CLUSTER-[FACET-[INDEXES]] (options) - start a run of chef-client on each server, tailing the logs and exiting when the run completes.'
 
       option :pid_file,
         :long        => "--pid_file",

data/lib/chef/knife/cluster_kill.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__)+"/generic_command.rb")
+require File.expand_path('ironfan_script', File.dirname(File.realdirpath(__FILE__)))
 
 class Chef
   class Knife

data/lib/chef/knife/cluster_launch.rb

@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__)+"/knife_common.rb")
-require File.expand_path(File.dirname(__FILE__)+"/cluster_bootstrap.rb")
+require File.expand_path('ironfan_knife_common', File.dirname(File.realdirpath(__FILE__)))
+require File.expand_path('cluster_bootstrap',    File.dirname(File.realdirpath(__FILE__)))
 
 class Chef
   class Knife
@@ -30,7 +30,7 @@ class Chef
         Chef::Knife::ClusterBootstrap.load_deps
       end
 
-      banner "knife cluster launch CLUSTER_NAME [FACET_NAME [INDEXES]] (options)"
+      banner "knife cluster launch      CLUSTER-[FACET-[INDEXES]] (options) - Creates chef node and chef apiclient, pre-populates chef node, and instantiates in parallel their cloud machines. With --bootstrap flag, will ssh in to machines as they become ready and launch the bootstrap process"
       [ :ssh_port, :ssh_password, :identity_file, :use_sudo,
         :prerelease, :bootstrap_version, :template_file, :distro,
         :bootstrap_runs_chef_client, :host_key_verify

data/lib/chef/knife/cluster_list.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__)+"/knife_common.rb")
+require File.expand_path('ironfan_knife_common', File.dirname(File.realdirpath(__FILE__)))
 
 class Chef
   class Knife

data/lib/chef/knife/cluster_proxy.rb

@@ -16,9 +16,8 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__)+"/knife_common.rb")
-require File.expand_path(File.dirname(__FILE__)+"/cluster_ssh.rb")
-require File.expand_path(File.dirname(__FILE__)+"/generic_command.rb")
+require File.expand_path('ironfan_script', File.dirname(File.realdirpath(__FILE__)))
+require File.expand_path('cluster_ssh',    File.dirname(File.realdirpath(__FILE__)))
 
 class Chef
   class Knife
@@ -34,7 +33,7 @@ class Chef
     class ClusterProxy < Ironfan::Script
 
       import_banner_and_options(Chef::Knife::ClusterSsh, :except => [:concurrency, ])
-      banner 'knife cluster proxy "CLUSTER [FACET [INDEXES]]" (options) - Runs the ssh command to open a SOCKS proxy to the given host, and writes a PAC (automatic proxy config) file to /tmp/ironfan_proxy-YOURNAME.pac. Only the first host is used, even if multiple match.'
+      banner 'knife cluster proxy       CLUSTER-[FACET-[INDEXES]] (options) - Runs the ssh command to open a SOCKS proxy to the given host, and writes a PAC (automatic proxy config) file to /tmp/ironfan_proxy-YOURNAME.pac. Only the first host is used, even if multiple match.'
 
       option :background,
         :long        => "--[no-]background",
@@ -103,7 +102,8 @@ class Chef
         end
       end
 
-      EC2_PROXY_PATTERNS = [ "*ec2*.amazonaws.com", "*ec2.internal*", "*compute-*.amazonaws.com", "*compute-*.internal*", "*domu*.internal*", "10.*",]
+      EC2_PROXY_PATTERNS = [] unless defined?(EC2_PROXY_PATTERNS)
+      EC2_PROXY_PATTERNS.unshift("*ec2*.amazonaws.com", "*ec2.internal*", "*compute-*.amazonaws.com", "*compute-*.internal*", "*domu*.internal*", "10.*",)
 
       def proxy_pac_contents
         proxy_patterns  = EC2_PROXY_PATTERNS

data/lib/chef/knife/cluster_show.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__)+"/knife_common.rb")
+require File.expand_path('ironfan_knife_common', File.dirname(File.realdirpath(__FILE__)))
 
 class Chef
   class Knife
@@ -26,7 +26,8 @@ class Chef
         Ironfan::KnifeCommon.load_deps
       end
 
-      banner "knife cluster show CLUSTER_NAME [FACET_NAME [INDEXES]] (options)"
+      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 machines on AWS cloud (default is yes, look up machines; use --no-cloud to skip)",

data/lib/chef/knife/cluster_ssh.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__)+"/knife_common.rb")
+require File.expand_path('ironfan_knife_common', File.dirname(File.realdirpath(__FILE__)))
 require 'chef/knife/ssh'
 
 class Chef
@@ -29,7 +29,7 @@ class Chef
         Ironfan::KnifeCommon.load_deps
       end
 
-      banner 'knife cluster ssh "CLUSTER [FACET [INDEXES]]" COMMAND (options)'
+      banner 'knife cluster ssh         CLUSTER-[FACET-[INDEXES]] COMMAND (options)'
       Chef::Knife::Ssh.options.each do |name, hsh|
         next if name == :attribute
         option name, hsh

data/lib/chef/knife/cluster_start.rb

@@ -16,8 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__)+"/knife_common.rb")
-require File.expand_path(File.dirname(__FILE__)+"/generic_command.rb")
+require File.expand_path('ironfan_script',       File.dirname(File.realdirpath(__FILE__)))
 
 class Chef
   class Knife

data/lib/chef/knife/cluster_stop.rb

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

data/lib/chef/knife/cluster_sync.rb

@@ -16,12 +16,12 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__)+"/generic_command.rb")
+require File.expand_path('ironfan_script', File.dirname(File.realdirpath(__FILE__)))
 
 class Chef
   class Knife
     class ClusterSync < Ironfan::Script
-      import_banner_and_options(Ironfan::Script)
+      import_banner_and_options(Ironfan::Script, :description => "Update chef server and cloud machines with current cluster definition")
 
       option :cloud,
         :long        => "--[no-]cloud",