ironfan 5.0.11 → 6.0.0

data/.gitignore

@@ -41,6 +41,10 @@ pkg
 .rvmrc
 .vendor
 .bundle
+.rspec
+.yardopts
+Gemfile.lock
+chefignore
 
 .rake_test_cache
 metadata.json

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "notes"]
+	path = notes
+	url = https://github.com/infochimps-labs/ironfan.wiki.git

data/Gemfile

@@ -1,40 +1,22 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-gem 'chef',          "~> 10.16"
-gem 'fog',           "~> 1.2"
-gem 'excon',         "~> 0.21.0"        # v0.22 breaks EC2 calls
-gem 'formatador',    "~> 0.2"
-gem 'gorillib',      "~> 0.5.0"
-gem 'rbvmomi'
-gem 'diff-lcs',      "~> 1.2.5"
 
-# Everything in the world is being a stupid dick about JSON versions. Pin it
-#   to the one that doesn't seem to angrify everyone.
-gem 'json',          "= 1.5.4"
+gemspec
 
 group :development do
-  gem 'bundler',     "~> 1.0"
   gem 'rake'
-  gem 'rspec',       "~> 2.8"
-  gem 'yard',        ">= 0.7"
-  #
-  gem 'redcarpet',   ">= 2.1"
-  gem 'oj',          ">= 1.2"
-end
-
-group :support do
-  gem 'jeweler',     ">= 1.6"
-  gem 'pry'
+  gem 'rspec',        '~> 2.8'
+  gem 'yard',         '>= 0.7'
+  gem 'redcarpet',    '>= 2.1'
+  gem 'oj',           '>= 1.2'
 end
 
 group :test do
-  gem 'simplecov',   ">= 0.5",   :platform => :ruby_19
-  #
-  gem 'guard',       "~> 1"
+  gem 'simplecov',    '>= 0.5'
+  gem 'guard',        '~> 1'
   gem 'guard-rspec'
   gem 'guard-yard'
   gem 'ruby_gntp'
   gem 'ruby-debug19'
-  #
   gem 'chef-zero'
 end

data/Gemfile.lock

@@ -1,23 +1,37 @@
+PATH
+  remote: .
+  specs:
+    ironfan (6.0.0)
+      chef (= 10.30.4)
+      diff-lcs (= 1.2.5)
+      excon (= 0.21.0)
+      fog (= 1.10.1)
+      formatador (= 0.2.4)
+      gorillib (= 0.5.0)
+      json (= 1.5.4)
+      rbvmomi (= 1.8.1)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
     builder (3.2.2)
     bunny (0.7.9)
-    chef (10.26.0)
+    chef (10.30.4)
       bunny (>= 0.6.0, < 0.8.0)
       erubis
-      highline (>= 1.6.9)
+      highline (~> 1.6, >= 1.6.9)
       json (>= 1.4.4, <= 1.7.7)
-      mixlib-authentication (>= 1.3.0)
-      mixlib-cli (>= 1.1.0)
-      mixlib-config (>= 1.1.2)
-      mixlib-log (>= 1.3.0)
-      mixlib-shellout
+      mime-types (~> 1.16)
+      mixlib-authentication (~> 1.3)
+      mixlib-cli (~> 1.1)
+      mixlib-config (~> 1.1, >= 1.1.2)
+      mixlib-log (~> 1.3)
+      mixlib-shellout (~> 1.3)
       moneta (< 0.7.0)
       net-ssh (~> 2.6)
       net-ssh-multi (~> 1.1.0)
-      ohai (>= 0.6.0)
+      ohai (>= 0.6.0, < 7.0.0)
       rest-client (>= 1.0.4, < 1.7.0)
       treetop (~> 1.4.9)
       uuidtools
@@ -48,7 +62,6 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.4)
-    git (1.2.5)
     gorillib (0.5.0)
       configliere (>= 0.4.13)
       json
@@ -66,13 +79,8 @@ GEM
       guard (>= 1.1.0)
       yard (>= 0.7.0)
     hashie (2.0.5)
-    highline (1.6.19)
+    highline (1.6.21)
     ipaddress (0.8.0)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
     json (1.5.4)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
@@ -82,34 +90,34 @@ GEM
       rb-kqueue (>= 0.2)
     lumberjack (1.0.3)
     method_source (0.8.1)
-    mime-types (1.23)
+    mime-types (1.25.1)
     mixlib-authentication (1.3.0)
       mixlib-log
-    mixlib-cli (1.3.0)
+    mixlib-cli (1.4.0)
     mixlib-config (1.1.2)
     mixlib-log (1.6.0)
-    mixlib-shellout (1.1.0)
+    mixlib-shellout (1.3.0)
     moneta (0.6.0)
-    multi_json (1.7.7)
-    net-scp (1.1.1)
+    multi_json (1.8.2)
+    net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.7)
+    net-ssh (2.7.0)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.1)
       net-ssh (>= 2.1.4)
       net-ssh-gateway (>= 0.99.0)
-    nokogiri (1.5.10)
-    ohai (6.16.0)
+    nokogiri (1.5.11)
+    ohai (6.20.0)
       ipaddress
       mixlib-cli
       mixlib-config
       mixlib-log
       mixlib-shellout
-      systemu
+      systemu (~> 2.5.2)
       yajl-ruby
     oj (2.1.2)
-    polyglot (0.3.3)
+    polyglot (0.3.4)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -123,12 +131,10 @@ GEM
       ffi (>= 0.5.0)
     rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
-    rbvmomi (1.6.0)
+    rbvmomi (1.8.1)
       builder
       nokogiri (>= 1.4.1)
       trollop
-    rdoc (4.0.1)
-      json (~> 1.4)
     redcarpet (2.3.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -159,12 +165,12 @@ GEM
     slop (3.4.5)
     systemu (2.5.2)
     thor (0.18.1)
-    treetop (1.4.14)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     trollop (2.0)
     uuidtools (2.1.4)
-    yajl-ruby (1.1.0)
+    yajl-ruby (1.2.0)
     yard (0.8.6.1)
 
 PLATFORMS
@@ -172,22 +178,13 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0)
-  chef (~> 10.16)
   chef-zero
-  diff-lcs (~> 1.2.5)
-  excon (~> 0.21.0)
-  fog (~> 1.2)
-  formatador (~> 0.2)
-  gorillib (~> 0.5.0)
   guard (~> 1)
   guard-rspec
   guard-yard
-  jeweler (>= 1.6)
-  json (= 1.5.4)
+  ironfan!
   oj (>= 1.2)
-  pry
   rake
-  rbvmomi
   redcarpet (>= 2.1)
   rspec (~> 2.8)
   ruby-debug19

data/NOTES-REALM.md

@@ -0,0 +1,172 @@
+# Ironfan Realms
+
+Realms in Ironfan are designed to provide us with a logical grouping for clusters (in a similar way
+that clusters provide a logical grouping of facets).
+
+## Scope
+
+Following the Principle of Least Surprise, it would make sense that attributes declared in the realm scope,
+apply to all clusters unless overridden. The same should go for roles, environment, cloud, and plugins.
+
+```ruby
+Ironfan.realm(:foo) do
+  environment :dev
+ 
+  role        :rick
+
+  cluster(:bar) do
+
+    role      :over
+
+    facet(:baz) do
+      environment :prod
+    end
+
+    facet(:qix) do
+      role    :out
+    end
+  end
+end
+
+baz_facet = Ironfan.realm(:foo).cluster(:bar).facet(:baz)
+baz_facet.environment.should eq(:prod)
+baz_facet.run_list.should include_roles(:rick, :over)
+
+qix_facet = Ironfan.realm(:foo).cluster(:bar).facet(:qix)
+qix_facet.environment.should eq(:dev)
+qix_facet.run_list.should include_roles(:rick, :over, :out)
+```
+
+You can also assign realms from within a cluster definition using the method `:realm_name`.
+This value defaults to the environment.
+
+```ruby
+Ironfan.cluster(:jib) do
+
+   environment :dev
+
+   realm_name  :yo		      
+		      
+end
+
+Ironfan.cluster(:jab) do
+
+   environment :dev
+
+end
+
+jib_cluster = Ironfan.cluster(:jib)
+jib_cluster.realm_name.should eq(:yo)
+
+jab_cluster = Ironfan.cluster(:jab)
+jab_cluster.realm_name.should eq(:dev)
+```
+
+## Security Groups
+
+Currently, Ironfan creates default security groups for clusters and cluster-facets and authorizes clusters
+to allow communication within itself. Because there may be cases where a particular cluster definition may
+show up in more than one realm, this behavior will have to be extended to include the realm name as well.
+Something that *wont'* be necessary is creating a realm only security group. This is partly because the need
+to open access to entire realms *seems* unlikely, and partly because there is a VPC security group limitation
+of five per machine.
+
+```
+Ironfan.realm(:cybertron) do
+
+  cluster(:autobot) do
+    facet(:ratchet) do
+      instances 1
+    end
+
+    facet(:bumblebee) do
+      instances 1
+    end
+  end
+
+  cluster(:decepticon) do
+    facet(:shockwave) do
+      instances 1
+    end
+
+    facet(:starscream) do
+      instances 1
+    end
+  end
+end
+
+bumblebee_facet = Ironfan.realm(:cybertron).cluster(:autobot).facet(:bumblebee)
+bumblebee_facet.security_groups should eq(%w[ systemwide cybertron-autobot cybertron-autobot-bumblebee ])
+
+shockwave_facet = Ironfan.realm(:cybertron).cluster(:decepticon).facet(:shockwave)
+starscream_facet = Ironfan.realm(:cybertron).cluster(:decepticon).facet(:starscream)
+
+shockwave_facet.machine.should have_access_to(starscream_facet.machine)
+shockwave_facet.machine.should_not have_access_to(bumblebee_facet.machine)
+```
+
+## Knife Commands
+
+Because of the possibility of cluster names not being unique across realms, the cluster commands will now have to be scoped
+by realm as well. This does have a nice side effect of allowing realms to be issued commands as a collective.
+
+By making the knife command explicitly call out the realm, only that realm file will be loaded (again to mitigate
+potential collisions in cluster definitions shared across realms), then all cluster files will be loaded.
+
+```bash
+knife cluster show p1-control-vcd
++------------------+-------+---------+----------+------------+-------------+------------+-------------+--------------+------------+
+| Name             | Chef? | State   | Flavor   | AZ         | Env         | MachineID  | Public IP   | Private IP   | Created On |
++------------------+-------+---------+----------+------------+-------------+------------+-------------+--------------+------------+
+| p1-control-vcd-0 | yes   | running | m1.large | us-east-1d | development | i-1ba48935 | 23.20.69.99 | 10.137.18.89 | 2014-02-26 |
++------------------+-------+---------+----------+------------+-------------+------------+-------------+--------------+------------+
+
+knife cluster show p1-control
++------------------+-------+---------+----------+------------+-------------+------------+-------------+--------------+------------+
+| Name             | Chef? | State   | Flavor   | AZ         | Env         | MachineID  | Public IP   | Private IP   | Created On |
++------------------+-------+---------+----------+------------+-------------+------------+-------------+--------------+------------+
+| p1-control-vcd-0 | yes   | running | m1.large | us-east-1d | development | i-1cd09387 | 69.14.23.44 | 10.114.10.12 | 2014-02-26 |
+| p1-control-zbx-0 | yes   | running | m1.large | us-east-1d | development | i-1ba48935 | 23.20.69.99 | 10.137.18.89 | 2014-02-26 |
++------------------+-------+---------+----------+------------+-------------+------------+-------------+--------------+------------+
+
+knife cluster show p1
++------------------+-------+---------+----------+------------+-------------+------------+-------------+--------------+------------+
+| Name             | Chef? | State   | Flavor   | AZ         | Env         | MachineID  | Public IP   | Private IP   | Created On |
++------------------+-------+---------+----------+------------+-------------+------------+-------------+--------------+------------+
+| p1-kfk-broker-0  | yes   | running | m1.large | us-east-1d | development | i-1io37214 | 52.31.45.9  | 10.88.54.36  | 2014-02-26 |
+| p1-kfk-broker-0  | yes   | running | m1.large | us-east-1d | development | i-1ws75110 | 56.90.76.10 | 10.121.27.64 | 2014-02-26 |
+| p1-control-vcd-0 | yes   | running | m1.large | us-east-1d | development | i-1cd09387 | 69.14.23.44 | 10.114.10.12 | 2014-02-26 |
+| p1-control-zbx-0 | yes   | running | m1.large | us-east-1d | development | i-1ba48935 | 23.20.69.99 | 10.137.18.89 | 2014-02-26 |
++------------------+-------+---------+----------+------------+-------------+------------+-------------+--------------+------------+
+```
+
+## Announce/Discovery
+
+When announcing and discovering using silverware, realms will need to be properly taken into account.
+Nothing much should change for announcements; you will still announce the system-subsystem pair and the realm
+will be provided from the node itself. You will not be able to announce outside of your realm or cluster. Discovery remains
+unchanged for the most part as well. Discover with system-subsystem pairs, and it will, by default look in your cluster first,
+then in your realm. This behavior can be overridden with options.
+
+```ruby
+node['new-phyrexia-sphere-0'].announce(:storm, :master)
+# {
+#   announces: {
+#     storm: {
+#       master: {
+#         cluster: 'phyrexia',
+#         realm:   'new'
+#       }
+#     }
+#   }
+# }
+
+storm_master = node['new-benalia-clan-0'].discover(:storm, :master)
+storm_master.name.should eq('new-phyrexia-sphere-0')
+
+storm_master = node['alara-bant-sigil-0'].discover(:storm, :master)
+storm_master.should be_nil
+
+storm_master = node['alara-bant-sigil-0'].discover(:storm, :master, realm: 'new')
+storm_master.name.should eq('new-phyrexia-sphere-0')
+```

data/Rakefile

@@ -1,91 +1,33 @@
-#
-# Rakefile for Cluster Chef Knife plugins
-#
-# Author::    Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
-# License::   Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
+require 'bundler/gem_tasks'
 
-require 'rubygems' unless defined?(Gem)
-require 'bundler'
-begin
-  Bundler.setup(:default, :development, :support)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'json'
-require 'jeweler'
 require 'rspec/core/rake_task'
-require 'yard'
-
-# Load constants from rake config file.
-$LOAD_PATH.unshift('tasks')
-Dir[File.join('tasks', '*.rake')].sort.each{|f| load(f) }
-
-# ---------------------------------------------------------------------------
-#
-# Jeweler -- release ironfan as a gem
-#
-
-Jeweler::Tasks.new do |gem|
-  gem.name        = 'ironfan'
-  gem.homepage    = "http://infochimps.com/labs"
-  gem.license     = NEW_COOKBOOK_LICENSE.to_s
-  gem.summary     = %Q{Infochimps' lightweight cloud orchestration toolkit, built on top of Chef.}
-  gem.description = %Q{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.}
-  gem.email       = SSL_EMAIL_ADDRESS
-  gem.authors     = ["Infochimps"]
-
-  ignores = File.readlines(".gitignore").grep(/^[^#]\S+/).map{|s| s.chomp }
-  dotfiles = [".gemtest", ".gitignore", ".rspec", ".yardopts"]
-  gem.files = dotfiles + Dir["**/*"].
-    reject{|f| File.directory?(f) }.
-    reject{|f| ignores.any?{|i| File.fnmatch(i, f) || File.fnmatch(i+'/*', f) || File.fnmatch(i+'/**/*', f) } }
-  gem.test_files = gem.files.grep(/^spec\//)
-  gem.require_paths = ['lib']
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-# ---------------------------------------------------------------------------
-#
-# RSpec -- testing
-#
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/{ironfan,chef,ironfan/*}/*_spec.rb'
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-  spec.rcov_opts = %w[ --exclude .rvm --no-comments --text-summary ]
+desc 'Run RSpec code examples with SimpleCov'
+task :coverage do
+  ENV['IRONFAN_COV'] = 'true'
+  Rake::Task[:spec].invoke
 end
 
+desc 'Run RSpec integration code examples'
 RSpec::Core::RakeTask.new(:integration) do |spec|
   spec.pattern = 'spec/integration/**/*_spec.rb'
 end
 
-# ---------------------------------------------------------------------------
-#
-# Yard -- documentation
-#
-YARD::Rake::YardocTask.new
-desc "Alias for 'rake yard'"
-task :doc => :yard
+require 'yard'
+YARD::Rake::YardocTask.new do |t|
+  additional_docs = %w[ CHANGELOG.md LICENSE.md README.md notes/INSTALL.md
+                        notes/core_concepts.md notes/knife-cluster-commands.md
+                        notes/philosophy.md notes/silverware.md notes/style_guide.md
+                        notes/tips_and_troubleshooting.md notes/walkthrough-hadoop.md
+                        notes/homebase-layout.txt notes/*.md notes/*.txt ]
+  t.files   = ['lib/**/*.rb', '-'] + additional_docs
+  t.options = ['--readme=README.md', '--markup=markdown', '--verbose']
+end
 
-# ---------------------------------------------------------------------------
+desc 'Generate YARD Documentation'
+task doc: [:yard]
 
-task :default => :spec
+task default: [:spec]

data/config/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"