cluster_chef-knife 3.0.9 → 3.0.10

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v3.0.10: Cloud fixes
+
+* security groups are now created/updated in knife cluster sync. This can't help you apply then to a node afer launch though -- nothing can, the API doesn't allow it.
+* clusters now all refer to an AMI named `cluster_chef-natty` by default, and to customizable roles `org_base`, `org_final` and `org_users` (where `org_base` has a role_implication for membership in the systemwide `org_base` security group)
+* default facet instances is now 1 who knows why it wasn't always 1.
+* minor linting of cluster before launching it
+* bump to latest versions of oneiric AMIs thx @redbeard
+* bootstrap fixes, oneiric support, more from @gchpaco
+
+
 ## v3.0.6: schism of cookbooks and tools
 
 * cookbooks all now live in [their own repo](https://github.com/infochimps-labs/cluster_chef-homebase), organized according to opscode standard.

data/README.md

@@ -1,12 +1,15 @@
 # cluster_chef
 
-Chef is a powerful tool for maintaining and describing the software and configurations that let a machine provide its services.
+Infrastructure as code: describe and orchestrate whole clusters of cloud or virtual machines. 
 
-cluster_chef is
+## Overview
 
-* a clean, expressive way to describe how machines and roles are assembled into a working cluster.
-* Our collection of Industrial-strength, cloud-ready recipes for Hadoop, Cassandra, HBase, Elasticsearch and more.
-* a set of conventions and helpers that make provisioning cloud machines easier.
+The cluster_chef toolset takes chef to the next level:
+
+* `cluster_chef` gem: assembles machines and roles into a working cluster using a clean, expressive domain-specific language.
+* `cluster_chef-knife` knife plugin: orchestrate clusters of machines, in the cloud or VMs.
+* `cluster_chef-homebase`: Our collection of industrial-strength, cloud-ready recipes for Hadoop, HBase, Cassandra, Elasticsearch, Zabbix and more.
+* the `metachef` cookbook: coordinate discovery of services ("list all the machines for `awesome_webapp`, that I might load balance them") and aspects ("
 
 ## Walkthrough
 

data/VERSION

@@ -1 +1 @@
-3.0.9
+3.0.10

data/cluster_chef-knife.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cluster_chef-knife"
-  s.version = "3.0.9"
+  s.version = "3.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2011-12-16"
+  s.date = "2012-01-17"
   s.description = "cluster_chef 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 = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "cluster_chef-knife.gemspec",
     "clusters/website_demo.rb",
     "config/client.rb",
+    "config/proxy.pac",
     "lib/chef/knife/bootstrap/ubuntu10.04-basic.erb",
     "lib/chef/knife/bootstrap/ubuntu10.04-cluster_chef.erb",
     "lib/chef/knife/bootstrap/ubuntu11.10-cluster_chef.erb",
@@ -62,7 +63,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://infochimps.com/labs"
   s.licenses = ["apachev2"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.15"
   s.summary = "cluster_chef 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.test_files = ["spec/cluster_chef/cluster_spec.rb", "spec/cluster_chef/facet_spec.rb", "spec/cluster_chef/server_slice_spec.rb", "spec/cluster_chef/server_spec.rb", "spec/cluster_chef_spec.rb", "spec/spec_helper/dummy_chef.rb", "spec/spec_helper.rb", "spec/test_config.rb"]
 

data/config/proxy.pac

@@ -0,0 +1,12 @@
+function FindProxyForURL(url, host) {
+  if ((shExpMatch(host, "*ec2*.amazonaws.com"      )) ||
+      (shExpMatch(host, "*ec2.internal*"           )) ||
+      (shExpMatch(host, "*compute-*.amazonaws.com" )) ||
+      (shExpMatch(host, "*compute-*.internal*"     )) ||
+      (shExpMatch(host, "*domu*.internal*"         )) ||
+      (shExpMatch(host, "10.*"                     )) 
+      ) {
+    return "SOCKS5 localhost:6666";
+  }
+  return "DIRECT";
+}

data/lib/chef/knife/cluster_launch.rb

@@ -32,7 +32,7 @@ class Chef
 
       banner "knife cluster launch CLUSTER_NAME [FACET_NAME [INDEXES]] (options)"
       [ :ssh_port, :ssh_password, :identity_file, :use_sudo,
-        :prerelease, :bootstrap_version, :template_file,
+        :prerelease, :bootstrap_version, :template_file, :distro
       ].each do |name|
         option name, Chef::Knife::Bootstrap.options[name]
       end
@@ -85,10 +85,6 @@ class Chef
         target.sync_to_cloud
         target.sync_to_chef
 
-        # Make security groups
-        section("Making security groups")
-        full_target.security_groups.each{|name,group| group.run }
-
         # Launch servers
         section("Launching machines", :green)
         target.create_servers

data/lib/chef/knife/cluster_show.rb

@@ -43,7 +43,7 @@ class Chef
           target.each do |svr|
             Chef::Log.debug( "Server #{svr.name}: #{JSON.pretty_generate(svr.to_hash)}" )
             Chef::Log.debug( "- cloud: #{JSON.pretty_generate(svr.cloud.to_hash)}" )
-            Chef::Log.debug( "- fog:   #{JSON.pretty_generate(svr.fog_description_for_launch)}" )
+            Chef::Log.debug( "- fog:   #{JSON.pretty_generate(svr.fog_launch_description)}" )
           end
         end
 

data/spec/cluster_chef/server_spec.rb

@@ -73,10 +73,10 @@ describe ClusterChef::Server do
   end
 
   describe 'launch' do
-    describe '#fog_description_for_launch' do
+    describe '#fog_launch_description' do
       it 'has right attributes' do
 
-        hsh = @server.fog_description_for_launch
+        hsh = @server.fog_launch_description
         hsh.delete(:user_data)
         hsh.should == {
           :image_id             => "ami-08f40561",
@@ -97,7 +97,7 @@ describe ClusterChef::Server do
       end
 
       it 'has right user_data' do
-        hsh = @server.fog_description_for_launch
+        hsh = @server.fog_launch_description
         user_data_hsh = JSON.parse( hsh[:user_data] )
         user_data_hsh.keys.should == ["chef_server", "validation_client_name", "validation_key", "attributes"]
         user_data_hsh["attributes"].keys.sort.should == [

metadata

@@ -1,125 +1,126 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cluster_chef-knife
-version: !ruby/object:Gem::Version
-  version: 3.0.9
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 3.0.10
 platform: ruby
-authors:
+authors: 
 - Infochimps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-17 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: chef
-  requirement: &70343609384260 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70343609384260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: fog
-  requirement: &70343609383380 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70343609383380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: formatador
-  requirement: &70343609382760 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70343609382760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: gorillib
-  requirement: &70343609397920 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70343609397920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &70343609396860 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1'
+      - !ruby/object:Gem::Version 
+        version: "1"
   type: :development
   prerelease: false
-  version_requirements: *70343609396860
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &70343609395620 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
+      - !ruby/object:Gem::Version 
+        version: "1.6"
   type: :development
   prerelease: false
-  version_requirements: *70343609395620
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70343609393700 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
+      - !ruby/object:Gem::Version 
+        version: "2.5"
   type: :development
   prerelease: false
-  version_requirements: *70343609393700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &70343609392020 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
+      - !ruby/object:Gem::Version 
+        version: "0.6"
   type: :development
   prerelease: false
-  version_requirements: *70343609392020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: configliere
-  requirement: &70343609391160 !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.4.8
   type: :development
   prerelease: false
-  version_requirements: *70343609391160
-description: cluster_chef 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.
+  version_requirements: *id009
+description: cluster_chef 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.
 email: coders@infochimps.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.md
-files:
+files: 
 - .gitignore
 - .rspec
 - CHANGELOG.md
@@ -133,6 +134,7 @@ files:
 - cluster_chef-knife.gemspec
 - clusters/website_demo.rb
 - config/client.rb
+- config/proxy.pac
 - lib/chef/knife/bootstrap/ubuntu10.04-basic.erb
 - lib/chef/knife/bootstrap/ubuntu10.04-cluster_chef.erb
 - lib/chef/knife/bootstrap/ubuntu11.10-cluster_chef.erb
@@ -162,35 +164,36 @@ files:
 - tasks/chef_config.rake
 - tasks/jeweler_use_alt_branch.rake
 homepage: http://infochimps.com/labs
-licenses:
+licenses: 
 - apachev2
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -4083111304779616796
+      segments: 
       - 0
-      hash: -900538870253244074
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: cluster_chef 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.
-test_files:
+summary: cluster_chef 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.
+test_files: 
 - spec/cluster_chef/cluster_spec.rb
 - spec/cluster_chef/facet_spec.rb
 - spec/cluster_chef/server_slice_spec.rb