ironfan 3.1.3 → 3.1.4

data/.yardopts

@@ -1,5 +1,10 @@
+--readme   README.md
+--markup   markdown
+--charset  UTF-8
+-
 VERSION
 CHANGELOG.md
 LICENSE.md
 README.md
-notes/*
+notes/*.md
+notes/*.txt

data/Gemfile

@@ -11,14 +11,17 @@ group :development do
   gem 'rspec',       "~> 2.5"
   gem 'yard',        "~> 0.6"
   gem 'redcarpet',   "~> 2"
-  gem 'configliere', "~> 0.4.8"
 end
 
 group :test do
   gem 'spork',       ">= 0.9.0", :platform => :mri
   gem 'rcov',        ">= 0.9.9", :platform => :ruby_18
   gem 'simplecov',   ">= 0.5",   :platform => :ruby_19
-  gem 'watchr',      "~> 0.7"
+  #
+  gem 'ruby_gntp'
+  gem 'guard',         "~> 1"
+  gem 'guard-rspec'
+  gem 'guard-yard'
 end
 
 group :support do

data/Guardfile

@@ -0,0 +1,9 @@
+# -*- ruby -*-
+
+# More info at https://github.com/guard/guard#readme
+
+guard 'yard' do
+  watch(%r{lib/.+\.rb})
+  watch(%r{notes/.+\.(md|txt)}) { "notes" }
+end
+

data/README.md

@@ -13,29 +13,30 @@ This repo implements:
 
 To jump right into using Ironfan, follow our [Installation Instructions](https://github.com/infochimps-labs/ironfan/wiki/INSTALL). For an explanatory tour, check out our [Hadoop Walkthrough](https://github.com/infochimps-labs/ironfan/wiki/INSTALL).  Please file all issues on [Ironfan issues](https://github.com/infochimps-labs/ironfan/issues).
 
-## Index
+### Tools
 
-The full Ironfan toolset:
+Ironfan consists of the following Toolset:
 
-###Core Tools:
+* [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 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.
+* [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-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): The core Ironfan models, and Knife plugins to orchestrate machines and coordinate truth among your homebase, cloud and chef server. It comes with [ironfan-homebase](https://github.com/infochimps-labs/ironfan-homebase).
-* [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-pantry/tree/master/cookbooks/silverware): Helps you 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"). Found within the [ironfan-pantry](https://github.com/infochimps-labs/ironfan-pantry).
-
-###Core Documentation:
-
-* [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 or questions and feature requests for *any* part of the Ironfan toolset.
-* [ironfan gem docs](http://rdoc.info/gems/ironfan): Rdoc docs for Ironfan.
-
-## What is Ironfan? 
-Ironfan is a systems provisioning and deployment tool. Ironfan automates not only machine configuration, but entire systems configuration to enable the entire Big Data stack, including tools for _data ingestion_, _scraping_, _storage_, _computation_, and _monitoring_.  
-
-Ironfan builds on Chef, but is opinionated about its architecture, which allows broader integration between components. It assumes a source repository, a central Chef Server, and a modern POSIX-compliant operating system for a base image. Currently, it works best with Git, Amazon Web Services, Ubuntu 11.04, with exploration into other virtualization platforms (Vagrant, etc.) and operating systems (Centos, FreeSBD, etc) ongoing, both inside and outside of Infochimps.
-
-To understand the Philosophy behind how we use Chef go [here](https://github.com/infochimps-labs/ironfan/wiki/Philosophy).
+### Documentation
 
+* [ironfan wiki](https://github.com/infochimps-labs/ironfan/wiki): high-level documentation and install instructions
+* [Index of wiki pages](https://github.com/infochimps-labs/ironfan/wiki/_pages)
+* [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 powers the [Infochimps Platform](http://www.infochimps.com/how-it-works), our scalable enterprise big data platform. Ironfan Enterprise adds zero-configuration logging, monitoring and a compelling UI.
+* [Ironfan Screencast](http://bit.ly/ironfan-hadoop-in-20-minutes) -- build a Hadoop cluster from scratch in 20 minutes.
 
+### The Ironfan Way
 
+* [Core Concepts](core_concepts)     -- Components, Announcements, Amenities and more.
+* [Philosophy](philosophy)            -- best practices and lessons learned
+* [Style Guide](style_guide)         -- common attribute names, how and when to include other cookbooks, and more
+* [Homebase Layout](homebase-layout) -- how this homebase is organized, and why

data/VERSION

@@ -1 +1 @@
-3.1.3
+3.1.4

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "3.1.3"
+  s.version = "3.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-02-23"
+  s.date = "2012-02-24"
   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 = [
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     ".yardopts",
     "CHANGELOG.md",
     "Gemfile",
+    "Guardfile",
     "LICENSE.md",
     "README.md",
     "Rakefile",
@@ -73,22 +74,31 @@ Gem::Specification.new do |s|
     "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/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-dsl_object.md",
     "notes/design_notes-meta_discovery.md",
     "notes/ec2-pricing_and_capacity.md",
-    "notes/ironfan_homebase_layout.md",
+    "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/ironfan/cluster_spec.rb",
     "spec/ironfan/facet_spec.rb",
     "spec/ironfan/server_slice_spec.rb",
@@ -120,7 +130,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.5"])
       s.add_development_dependency(%q<yard>, ["~> 0.6"])
       s.add_development_dependency(%q<redcarpet>, ["~> 2"])
-      s.add_development_dependency(%q<configliere>, ["~> 0.4.8"])
     else
       s.add_dependency(%q<chef>, ["~> 0.10.4"])
       s.add_dependency(%q<fog>, ["~> 1.1.1"])
@@ -131,7 +140,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 2.5"])
       s.add_dependency(%q<yard>, ["~> 0.6"])
       s.add_dependency(%q<redcarpet>, ["~> 2"])
-      s.add_dependency(%q<configliere>, ["~> 0.4.8"])
     end
   else
     s.add_dependency(%q<chef>, ["~> 0.10.4"])
@@ -143,7 +151,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["~> 2.5"])
     s.add_dependency(%q<yard>, ["~> 0.6"])
     s.add_dependency(%q<redcarpet>, ["~> 2"])
-    s.add_dependency(%q<configliere>, ["~> 0.4.8"])
   end
 end
 

data/lib/ironfan/cloud.rb

@@ -57,7 +57,7 @@ module Ironfan
       end
 
       # default values to apply where no value was set
-      # @returns [Hash] hash of defaults
+      # @return [Hash] hash of defaults
       def defaults
         reverse_merge!({
           :image_name         => 'natty',

data/lib/ironfan/dsl_object.rb

@@ -54,7 +54,7 @@ module Ironfan
     #
     # Defines DSL attributes
     #
-    # @params [Array(String)] key_names DSL attribute names
+    # @param [Array(String)] key_names DSL attribute names
     #
     # @example
     #   class Mom < Ironfan::DslObject

data/lib/ironfan/server_slice.rb

@@ -236,7 +236,7 @@ module Ironfan
     #
     # @yield each server, in turn
     #
-    # @return array (in same order as servers) of each block's result
+    # @return [Array] array (in same order as servers) of each block's result
     def parallelize
       servers.map do |svr|
         sleep(0.1) # avoid hammering with simultaneous requests
@@ -251,7 +251,7 @@ module Ironfan
     # @param [Symbol]  method   -- method to call on each server
     # @param [Boolean] threaded -- execute each call in own thread
     #
-    # @return array (in same order as servers) of results for that method
+    # @return [Array] array (in same order as servers) of results for that method
     def delegate_to_servers method, threaded = true
       if threaded  # Call in threads
         threads = parallelize{|svr| svr.send(method) }

data/notes/Home.md

@@ -1,10 +1,19 @@
 ## Overview
 
-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. 
+Ironfan, the foundation of The Infochimps Platform, is an expressive toolset for constructing scalable, resilient architectures. It works in the cloud, in the data center, and on your laptop, and it makes your system diagram visible and inevitable. Inevitable systems coordinate automatically to interconnect, removing the hassle of manual configuration of connection points (and the associated danger of human error).
+For more information about Ironfan and The Infochimps Platform, visit the [Infochimps Blog introducing the Infochimps Platform](http://blog.infochimps.com/2012/02/22/infochimps-platform/).
 
-### Code, documentation and support:
+## Getting Started
 
-Ironfan consists of the following:
+* [Installation Instructions](https://github.com/infochimps-labs/ironfan/wiki/INSTALL)
+* [Hadoop Walkthrough](https://github.com/infochimps-labs/ironfan/wiki/INSTALL)
+* [Index of wiki pages](https://github.com/infochimps-labs/ironfan/wiki/_pages)
+* Ironfan powers the [Infochimps Platform](http://www.infochimps.com/how-it-works), our scalable enterprise big data platform. Ironfan Enterprise adds zero-configuration logging, monitoring and a compelling UI.
+* [Ironfan Screencast](http://bit.ly/ironfan-hadoop-in-20-minutes) -- build a Hadoop cluster from scratch in 20 minutes.
+
+### Tools
+
+Ironfan consists of the following 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):
@@ -13,18 +22,23 @@ Ironfan consists of the following:
   - logic to coordinate truth among chef server and cloud providers.
 * [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*.
+
+### Documentation
 
 * [ironfan wiki](https://github.com/infochimps-labs/ironfan/wiki): high-level documentation and install instructions
+* [Index of wiki pages](https://github.com/infochimps-labs/ironfan/wiki/_pages)
 * [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
 
-Please file all issues on [ironfan issues](https://github.com/infochimps-labs/ironfan/issues).
+### The Ironfan Way
 
-## Table of Contents
+* [Core Concepts](core_concepts)     -- Components, Announcements, Amenities and more.
+* [Philosophy](philosopy)            -- best practices and lessons learned
+* [Style Guide](style_guide)         -- common attribute names, how and when to include other cookbooks, and more
+* [Homebase Layout](homebase-layout) -- how this homebase is organized, and why
 
-@sya please complete
+__________________________________________________________________________
+__________________________________________________________________________
+__________________________________________________________________________
 
 
-* [INSTALL](https://github.com/infochimps-labs/ironfan/wiki/INSTALL) -- How to get started
-* ...

data/notes/INSTALL-cloud_setup.md

@@ -22,7 +22,7 @@
 * create AWS account
   - [sign up for AWS + credit card + password]
   - make IAM users for admins
-  - add your IAM keys into your {credentials}/knife-user
+  - add your IAM keys into your `{credentials}/knife-user`
 
 * create opscode account
   - download org keys, put in the credentials repo
@@ -87,14 +87,14 @@
   sudo umount /dev/xvdh
   exit
 ```
-* Back in the AWS console, snapshot the volume and name it {org}-home_drive. Delete the original volume as it is not needed anymore.
-  # While you're in there, make {org}-resizable_1gb a 'Minimum-sized snapshot, resizable -- use xfs_growfs to resize after launch' snapshot.
+* Back in the AWS console, snapshot the volume and name it `{org}-home_drive`. Delete the original volume as it is not needed anymore.
+  # While you're in there, make `{org}-resizable_1gb` a 'Minimum-sized snapshot, resizable -- use `xfs_growfs` to resize after launch' snapshot.
   
 * Paste the snapshot id into your cnc_cluster definition file. 
   - ssh into the newly launched cnc_cluster-nfs.
   - You should restart the machine via the AWS console (may or may not be necessary, do anyway).
 
 * Manipulate security groups
-  - nfs_server group should open all UDP ports and all TCP ports to nfs_client group
+  - `nfs_server` group should open all UDP ports and all TCP ports to `nfs_client` group
 
 * Change /etc/ssh/sshd_config to be passwordful and restart the ssh service

data/notes/INSTALL.md

@@ -1,59 +1,49 @@
+# Ironfan Installation Instructions
+
 First of all, every Chef installation needs a Chef Homebase. Chef Homebase is the place where cookbooks, roles, config files and other artifacts for managing systems with Chef will live. Store this homebase in a version control system such as Git and treat it like source code.
 
-### Conventions
+## Conventions
 
 In all of the below,
 
 * `{homebase}`: is the directory that holds your Chef cookbooks, roles and so forth. For example, this file is in `{homebase}/README.md`.
-
 * `{username}`: identifies your personal Chef client name: the thing you use to log into the Chef WebUI.
-
 * `{organization}`: identifies the credentials set and cloud settings to use.  If your Chef server is on the Opscode platform (Try it! It's super-easy), use your organization name (the last segment of your chef_server url). If not, use an identifier you deem sensible.
 
-Ironfan Installation Instructions
-============
+<a name="initial_install"></a>
+## Install Ironfan's Gem and Homebase
 
-_Before you begin, fork the repo as you'll be making changes to personalize it for your platform._
+_Before you begin, you may wish to fork homebase repo, as you'll be making changes to personalize it for your platform that you may want to share with teammates. If you do so, replace all references to infochimps-labs/ironfan-homebase with your fork's path._
+
+1. Install the Ironfan gem (you may need to use `sudo`):
+
+        gem install ironfan
 
 1. Clone the repo. It will produce the directory we will call `homebase` from now on:
 
         git clone https://github.com/infochimps-labs/ironfan-homebase homebase
         cd homebase
-        git submodule foreach git checkout master
         git submodule update --init
+        git submodule foreach git checkout master
 
-2. Install the Ironfan gem (you may need to use `sudo`):
-
-        gem install ironfan
-
-3. Set up your [knife.rb](http://wiki.opscode.com/display/chef/Knife#Knife-ConfiguringYourSystemForKnife) file.
-
-  
-
-Go to the [Knife Plugins](http://wiki.opscode.com/display/chef/Knife+Plugins) in the Chef Wiki for additional information.
-
-
-__________________________________________________________________________
-
-
-Installing the [knife.rb](http://wiki.opscode.com/display/chef/Knife#Knife-ConfiguringYourSystemForKnife) file when using Ironfan has proven exceedingly useful -- it leaves you in good shape to avoid problems with credential management, importing 3rd-party cookbooks, and other things down the road.
+<a name="knife-configuration"></a>
+## Configure Knife and Add Credentials
 
-## <a name="knife-configuration" />Standard Knife Configuration
+Ironfan expands out the traditional singular [knife.rb](http://wiki.opscode.com/display/chef/Knife#Knife-ConfiguringYourSystemForKnife) into several components. This modularity allows for better management of sensitive shared credentials, personal credentials, and organization-wide configuration.
 
 ### Set up 
 
-_Note_: If your local username differs from your Opscode Chef username, then you should `export CHEF_USER={username}` using your Opscode username (e.g. from your .bashrc) before you run any knife commands.
+_Note_: If your local username differs from your Opscode Chef username, then you should `export CHEF_USER={username}` (eg from your `.bashrc`) before you run any knife commands.
 
-1. So that Knife finds its configuration files, symlink the `{homebase}/knife` directory (the one holding this file) to be your `~/.chef` folder.
+So that Knife finds its configuration files, symlink the `{homebase}/knife` directory (the one holding this file) to be your `~/.chef` folder.
 
         cd {homebase} 
         ln -sni $CHEF_HOMEBASE/knife ~/.chef
 
-**HEY @MRFLIP MAKE SURE THAT THIS WORKS WITHOUT THE CHEF HOMEBASE VARIABLE SET**
+<a name="credentials"></a>
+### Credentials Directory
 
-### <a name="credentials" />Credentials
-
-All the keys and settings specific to your organization are held in a directory named `credentials/`, versioned and distributed independently of the homebase. 
+All the keys and settings specific to your organization are held in a directory named `credentials/`, versioned independently of the homebase.
 
 To set up your credentials directory, visit `{homebase}/knife` and duplicate the example, naming it `credentials`:
 
@@ -63,21 +53,42 @@ To set up your credentials directory, visit `{homebase}/knife` and duplicate the
         cd credentials
         git init ; git add .
         git commit -m "New credentials universe for $CHEF_ORGANIZATION" .
-        
-### User / Cloud config
 
-Edit the following places in your new `credentials`:
+You will likely want to store the credentials in another remote repository. We recommend erring on the side of caution in its hosting. Setting that up is outside the scope of this guide, but there [good external resources](http://book.git-scm.com/3_distributed_workflows.html) available to get you started.
 
-* Organization-specific settings are in `knife/{organization}-credentials/knife-org.rb`:
-  - _organization_:             Your organization name 
-  - _chef server url_:          Edit the lines for your `chef_server_url` and `validator`. 
+<a name="download"></a>
+### Download Cloud Credentials
+
+You will need to obtain user keys from your cloud providers. Your AWS access keys can be obtained from [Amazon IAM](https://console.aws.amazon.com/iam/home):
+
+![Reset AWS User Key](https://github.com/infochimps-labs/ironfan/wiki/aws_user_key.png)
 
-If you are an Opscode platform user, you can skip this step -- your `chef_server_url` defaults to `https://api.opscode.com/organizations/#{organization}` and your validator to `{organization}-validator.pem`.
-  
-- Cloud-specific settings, if you are targeting a cloud provider, add account information and configuration here. 
+__________________________________________________________________________
+
+Your Opscode user key can be obtained from the [Opscode Password settings](https://www.opscode.com/account/password) console:
+
+![Reset Opscode User Key](https://github.com/infochimps-labs/ironfan/wiki/opscode_user_key.png)
+
+__________________________________________________________________________
+
+Your Opscode organization validator key can be obtained from the [Opscode Organization management](https://manage.opscode.com/organizations) console, by choosing the `Regenerate validation key` link:
 
-* User-specific settings are in `knife/credentials/knife-user-{username}.rb`. (You can duplicate and rename the one in `knife/example-credentials/knife-user-example.rb`)
-  - for example, if you're using Amazon EC2 you should set your access keys:
+![Reset Opscode Organization Key](https://github.com/infochimps-labs/ironfan/wiki/opscode_org_key.png)
+
+__________________________________________________________________________
+
+
+<a name="org"></a>
+### User / Organization-specific config
+
+Edit the following in your new `credentials`:
+
+* Organization-specific settings are in `knife/{organization}-credentials/knife-org.rb`:
+  - _organization_:          Your organization name 
+  - _chef server url_:       Edit the lines for your `chef_server_url` and `validator`. _Note_: If you are an Opscode platform user, you can skip this step -- your `chef_server_url` defaults to `https://api.opscode.com/organizations/#{organization}` and your validator to `{organization}-validator.pem`.
+  - Cloud-specific settings: if you are targeting a cloud provider, add account information and configuration here. 
+
+* User-specific settings are in `knife/credentials/knife-user-{username}.rb`. (You can duplicate and rename the one in `knife/example-credentials/knife-user-example.rb`). For example, if you're using Amazon EC2 you should set your access keys:
 
           Chef::Config.knife[:aws_access_key_id]      = "XXXX"
           Chef::Config.knife[:aws_secret_access_key]  = "XXXX"
@@ -87,19 +98,12 @@ If you are an Opscode platform user, you can skip this step -- your `chef_server
 
 * Organization validator key in `{credentials_path}/{organization}-validator.pem`
 
-* If you have existing Amazon machines, place their keypairs in `{credentials_path}/ec2_keys` 
-
-__________________________________________________________________________
+* If you have existing Amazon machines, place their keypairs in `{credentials_path}/ec2_keys`. Ironfan will also automatically populate this with new keys as new clusters are created. Commit the resulting keys back to the credentials repo to share them with your teammates, or they will be unable to make certain calls against the resulting architecture.
 
+<a name="go_speed_racer"></a>
 ## Try it out
 
-You should now be able to use Knife.
-
-        $ knife client list
-        chef-webui
-        cocina-chef_server-0
-        cocina-sandbox-0
-        cocina-validator
+You should now be able to use Knife to control your clusters:
 
         $ knife cluster list
         +--------------------+---------------------------------------------------+ 
@@ -114,22 +118,12 @@ You should now be able to use Knife.
 
 Launching a cluster in the cloud should now be this easy!
 
-        knife cluster launch sandbox:simple --bootstrap
-__________________________________________________________________________
+        knife cluster launch sandbox-simple --bootstrap
 
-**SYAFLAG: Not sure where the stuff below, before getting to Next is supposed to go.  Here?**
+## Next
 
-To get started with Knife and Chef, follow the [Chef Fast Start Guide](http://wiki.opscode.com/display/chef/Fast+Start+Guide). We use the hosted Chef service and are happy, we are sure you'll be happy with it too (there are instructions in the wiki to set up a Chef server, if that's what you prefer). Stop when you get to "Bootstrap the Ubuntu system" -- Ironfan makes that much easier. **SYAFLAG: "Bootstrap the Ubuntu System is the 1st step in the EC2 Bootstrap Fast Start Guide, so should we include EC2 Bootstrap Fast Start Guide?**
-
-* [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) (**Wow, we do everything in that page in _one_ command.**)
-
-
-### Next
-
-The README file in each of the subdirectories for more information about what goes in those directories. If you are bored of reading, go customize one of the files in the 'clusters/ directory'. Or, if you're a fan of ridiculous things and have ever pondered how many things you can fit in one box, launch el_[ridiculoso:](http://www.spanishdict.com/translate/ridiculoso). It contains every single recipe we have ever made stacked on top of one another. 
+The README file in each of the subdirectories for more information about what goes in those directories. If you are bored of reading, go customize one of the files in the 'clusters/ directory'. Or, if you're a fan of ridiculous things and have ever pondered how many things you can fit in one box, launch el_ridiculoso:. It contains every single recipe we have ever made stacked on top of one another.
 
         knife cluster launch el_ridiculoso-gordo --bootstrap
 
-
-For more information about configuring Knife, see the [Knife documentation](http://wiki.opscode.com/display/chef/knife).
+For more information about configuring Knife, see the [Knife documentation](http://wiki.opscode.com/display/chef/knife).

data/notes/advanced-superpowers.md

@@ -0,0 +1,16 @@
+### 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.
+
+To get started with knife and chef, follow the "Chef Quickstart,":http://wiki.opscode.com/display/chef/Quick+Start We use the hosted chef service and are very happy, but there are instructions on the wiki to set up a chef server too. Stop when you get to "Bootstrap the Ubuntu system" -- cluster chef is going to make that much easier.
+
+* [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)
+
+### 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.