ironfan 4.9.10 → 4.10.1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v4.10.1
+* Fixing bug in server role assignment (doesn't use cluster_role for some reason)
+
+# v4.10.0
+* Updating automatic roles to "#{name}-cluster" and "#{name}-facet", to avoid name collision with conventional roles (thanks, @jessehu)
+* Added newly-ebs optimizeable instances to approved list (thanks @mrflip)
+
 # v4.9.10
 * fixing up file permissions (was causing glitch for bundles installed as root)
 
@@ -180,7 +187,7 @@
 
 # v4.1.1: fixing 'rake spec'
 * Remove all defunct tests and start fresh (fixes #137)
-* Failing spec for #158 
+* Failing spec for #158
 
 # v4.1.0: several bug-fixes and code cleanup
 * Splat the args to DSL::Volume.snapshot_id so we can call it properly (fixes #161)
@@ -261,9 +268,9 @@ You should reload your chef server:
   - 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). 
+* 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!
@@ -272,7 +279,7 @@ You should reload your chef server:
 __________________________________________________________________________
 __________________________________________________________________________
 
-## v3.0.14: 
+## v3.0.14:
 
 Big important change:
 
@@ -290,8 +297,8 @@ Other improvements/fixes:
 * FIX #76 -- `knife cluster kick` runs chef-client if the service is stopped. Fixes #76 . Also knife ssh will at its end show a bright red list of machines whose commands exited with a non-zero exit code -- useful when 1 out of 30 machines fails a knife cluster kick.
 * A limited number of commands (ssh, show, kill) now run with no requirement of cloud anything (Relates to #28). Also worked around an annoying incompatibility with chef 0.10.8 (clients have a 'name') vs 0.10.40-and-prev (clients have a 'clientname'.
 * examples all live in `ironfan-homebase` now.
-* When you `knife cluster stop` a node, it sets `node[:state]` to 
-* the cookbook linter now has its own project: [ironfan-scrubby](https://github.com/infochimps-labs/ironfan-scrubby). Along the way, 
+* When you `knife cluster stop` a node, it sets `node[:state]` to
+* the cookbook linter now has its own project: [ironfan-scrubby](https://github.com/infochimps-labs/ironfan-scrubby). Along the way,
   - some ability to cycle comments from the attributes file into node attribute docs in the `metadata.rb`.
   - added helpful links to the `README.md` template
 * minor fix to the new `authorized_by` calls
@@ -344,12 +351,12 @@ Ironfan underwent a major upgrade with the last several commits.
 
 The following behaviors have been removed:
 
-* `use` -- **BREAKING** Was supposed to let me import another cluster definition into the one calling use. However, it didn't work as advertised, was clutter-y and was actively unpopular (issue #6). 
+* `use` -- **BREAKING** Was supposed to let me import another cluster definition into the one calling use. However, it didn't work as advertised, was clutter-y and was actively unpopular (issue #6).
   - Until the usage of derived clusters becomes clear, say `merge!` on a hash instead.
   - We do default settings for you.
   - We *don't* put in any default roles (as the old `use :defaults` did).
 
-* `cloud` -- **BREAKING** a bare `cloud` statement is meaningless: the *attributes* may be abstract, but the *values* are different for every provider. 
+* `cloud` -- **BREAKING** a bare `cloud` statement is meaningless: the *attributes* may be abstract, but the *values* are different for every provider.
   - Anywhere you used to say `cloud`, say `ec2`: eg `ec2.flavor('t1.micro')` instead of `cloud.flavor('t1.micro')`.
 
 * `chef_attributes` -- **BREAKING** replaced by `facet_role.override_attributes`, `facet_role.default_attributes` (or those methods on `cluster_role`.)
@@ -378,7 +385,7 @@ Several knife scripts saw name changes to their params. If you have external scr
   - bring up the cluster ; by default the service state for all the daemons is [:disable, :stop].
   - run the `/etc/hadoop/conf/bootstrap_hadoop_namenode.sh` to format your HDFS
   - move the service state to '[:enable, :start]' and re-run chef client
-  
+
 
 #### Deprecated cookbooks
 

data/VERSION

@@ -1 +1 @@
-4.9.10
+4.10.1

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.9.10"
+  s.version = "4.10.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2013-04-22"
+  s.date = "2013-05-08"
   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 = [
@@ -155,7 +155,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.23"
   s.summary = "Infochimps' lightweight cloud orchestration toolkit, built on top of Chef."
-  s.test_files = ["spec/spec_helper/dummy_chef.rb", "spec/integration/spec_helper/launch_cluster.rb", "spec/integration/minimal-chef-repo/roles/systemwide.rb", "spec/integration/minimal-chef-repo/environments/_default.json", "spec/integration/minimal-chef-repo/chefignore", "spec/integration/minimal-chef-repo/knife/knife.rb", "spec/integration/minimal-chef-repo/knife/credentials/knife-org.rb", "spec/integration/spec/simple_cluster_spec.rb", "spec/integration/spec/elb_build_spec.rb", "spec/integration/spec_helper.rb", "spec/ironfan/cluster_spec.rb", "spec/ironfan/ec2/cloud_provider_spec.rb", "spec/ironfan/ec2/elb_spec.rb", "spec/ironfan/ec2/security_group_spec.rb", "spec/chef/cluster_launch_spec.rb", "spec/chef/cluster_bootstrap_spec.rb", "spec/fixtures/gunbai_slice.json", "spec/fixtures/ec2/elb/snakeoil.key", "spec/fixtures/ec2/elb/snakeoil.crt", "spec/fixtures/gunbai.rb", "spec/spec_helper.rb", "spec/test_config.rb"]
+  s.test_files = ["spec/spec_helper/dummy_chef.rb", "spec/integration/spec_helper/launch_cluster.rb", "spec/integration/minimal-chef-repo/roles/systemwide.rb", "spec/integration/minimal-chef-repo/chefignore", "spec/integration/minimal-chef-repo/knife/credentials/knife-org.rb", "spec/integration/minimal-chef-repo/knife/knife.rb", "spec/integration/minimal-chef-repo/environments/_default.json", "spec/integration/spec/simple_cluster_spec.rb", "spec/integration/spec/elb_build_spec.rb", "spec/integration/spec_helper.rb", "spec/test_config.rb", "spec/chef/cluster_bootstrap_spec.rb", "spec/chef/cluster_launch_spec.rb", "spec/fixtures/gunbai_slice.json", "spec/fixtures/ec2/elb/snakeoil.crt", "spec/fixtures/ec2/elb/snakeoil.key", "spec/fixtures/gunbai.rb", "spec/spec_helper.rb", "spec/ironfan/cluster_spec.rb", "spec/ironfan/ec2/cloud_provider_spec.rb", "spec/ironfan/ec2/elb_spec.rb", "spec/ironfan/ec2/security_group_spec.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/ironfan/dsl/cluster.rb

@@ -6,7 +6,7 @@ module Ironfan
 
       def initialize(attrs={},&block)
         super
-        self.cluster_role       Ironfan::Dsl::Role.new(:name => "#{attrs[:name]}_cluster")
+        self.cluster_role       Ironfan::Dsl::Role.new(:name => "#{attrs[:name]}-cluster")
       end
 
       # Utility method to reference all servers from constituent facets

data/lib/ironfan/dsl/ec2.rb

@@ -292,12 +292,12 @@ Chef::Config[:ec2_flavor_info].merge!({
     'c1.medium'   => { :price => 0.17,  :bits => 64, :ram =>   1740, :cores => 2, :core_size => 2.5,  :inst_disks => 1, :inst_disk_size =>  350, :ephemeral_volumes => 1 },
     #
     'm1.large'    => { :price => 0.32,  :bits => 64, :ram =>   7680, :cores => 2, :core_size => 2,    :inst_disks => 2, :inst_disk_size =>  850, :ephemeral_volumes => 2, :ebs_optimizable =>  500, },
-    'm2.xlarge'   => { :price => 0.45,  :bits => 64, :ram =>  18124, :cores => 2, :core_size => 3.25, :inst_disks => 1, :inst_disk_size =>  420, :ephemeral_volumes => 1 },
-    'm3.xlarge'   => { :price => 0.50,  :bits => 64, :ram =>  15360, :cores => 4, :core_size => 3.25, :inst_disks => 0, :inst_disk_size =>  0,   :ephemeral_volumes => 0 },
-    'c1.xlarge'   => { :price => 0.64,  :bits => 64, :ram =>   7168, :cores => 8, :core_size => 2.5,  :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 4 },
+    'm2.xlarge'   => { :price => 0.45,  :bits => 64, :ram =>  18124, :cores => 2, :core_size => 3.25, :inst_disks => 1, :inst_disk_size =>  420, :ephemeral_volumes => 1, },
+    'm3.xlarge'   => { :price => 0.50,  :bits => 64, :ram =>  15360, :cores => 4, :core_size => 3.25, :inst_disks => 0, :inst_disk_size =>  0,   :ephemeral_volumes => 0, :ebs_optimizable =>  500, },
+    'c1.xlarge'   => { :price => 0.64,  :bits => 64, :ram =>   7168, :cores => 8, :core_size => 2.5,  :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 4, :ebs_optimizable => 1000, },
     'm1.xlarge'   => { :price => 0.66,  :bits => 64, :ram =>  15360, :cores => 4, :core_size => 2,    :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 4, :ebs_optimizable => 1000, },
-    'm3.2xlarge'  => { :price => 1.00, :bits => 64, :ram =>  30720, :cores => 8, :core_size => 3.25, :inst_disks => 0, :inst_disk_size =>  0,   :ephemeral_volumes => 0 },
-    'm2.2xlarge'  => { :price => 0.90,  :bits => 64, :ram =>  35020, :cores => 4, :core_size => 3.25, :inst_disks => 2, :inst_disk_size =>  850, :ephemeral_volumes => 2 },
+    'm3.2xlarge'  => { :price => 1.00,  :bits => 64, :ram =>  30720, :cores => 8, :core_size => 3.25, :inst_disks => 0, :inst_disk_size =>  0,   :ephemeral_volumes => 0, :ebs_optimizable => 1000, },
+    'm2.2xlarge'  => { :price => 0.90,  :bits => 64, :ram =>  35020, :cores => 4, :core_size => 3.25, :inst_disks => 2, :inst_disk_size =>  850, :ephemeral_volumes => 2, :ebs_optimizable =>  500, },
     'm2.4xlarge'  => { :price => 1.80,  :bits => 64, :ram =>  70041, :cores => 8, :core_size => 3.25, :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 4, :ebs_optimizable => 1000, },
     'cc1.4xlarge' => { :price => 1.30,  :bits => 64, :ram =>  23552, :cores => 8, :core_size => 4.19, :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm' },
     'cc1.8xlarge' => { :price => 2.40,  :bits => 64, :ram =>  61952, :cores =>16, :core_size => 5.50, :inst_disks => 8, :inst_disk_size => 3370, :ephemeral_volumes => 4, :placement_groupable => true, :virtualization => 'hvm' },

data/lib/ironfan/dsl/facet.rb

@@ -9,7 +9,7 @@ module Ironfan
       def initialize(attrs={},&block)
         self.cluster_name       = attrs[:owner].name unless attrs[:owner].nil?
         self.name               = attrs[:name] unless attrs[:name].nil?
-        self.facet_role         Ironfan::Dsl::Role.new(:name => full_name.sub('-','_'))
+        self.facet_role         Ironfan::Dsl::Role.new(:name => "#{full_name}-facet")
         super
         for i in 0 .. instances-1; server(i); end
       end

data/lib/ironfan/dsl/server.rb

@@ -10,7 +10,7 @@ module Ironfan
           self.cluster_name =   attrs[:owner].cluster_name
           self.facet_name =     attrs[:owner].name
 
-          self.role     "#{self.cluster_name}_cluster", :last
+          self.role     "#{self.cluster_name}-cluster", :last
           self.role     attrs[:owner].facet_role.name,  :last
         end
         super

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 4.9.10
+  version: 4.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -359,7 +359,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -951725274984754439
+      hash: -3786233878375711747
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -376,22 +376,22 @@ test_files:
 - spec/spec_helper/dummy_chef.rb
 - spec/integration/spec_helper/launch_cluster.rb
 - spec/integration/minimal-chef-repo/roles/systemwide.rb
-- spec/integration/minimal-chef-repo/environments/_default.json
 - spec/integration/minimal-chef-repo/chefignore
-- spec/integration/minimal-chef-repo/knife/knife.rb
 - spec/integration/minimal-chef-repo/knife/credentials/knife-org.rb
+- spec/integration/minimal-chef-repo/knife/knife.rb
+- spec/integration/minimal-chef-repo/environments/_default.json
 - spec/integration/spec/simple_cluster_spec.rb
 - spec/integration/spec/elb_build_spec.rb
 - spec/integration/spec_helper.rb
-- spec/ironfan/cluster_spec.rb
-- spec/ironfan/ec2/cloud_provider_spec.rb
-- spec/ironfan/ec2/elb_spec.rb
-- spec/ironfan/ec2/security_group_spec.rb
-- spec/chef/cluster_launch_spec.rb
+- spec/test_config.rb
 - spec/chef/cluster_bootstrap_spec.rb
+- spec/chef/cluster_launch_spec.rb
 - spec/fixtures/gunbai_slice.json
-- spec/fixtures/ec2/elb/snakeoil.key
 - spec/fixtures/ec2/elb/snakeoil.crt
+- spec/fixtures/ec2/elb/snakeoil.key
 - spec/fixtures/gunbai.rb
 - spec/spec_helper.rb
-- spec/test_config.rb
+- spec/ironfan/cluster_spec.rb
+- spec/ironfan/ec2/cloud_provider_spec.rb
+- spec/ironfan/ec2/elb_spec.rb
+- spec/ironfan/ec2/security_group_spec.rb