the-maestro 0.2.0 → 0.3.0

data/.gitignore

@@ -20,6 +20,12 @@ tmtags
 coverage
 rdoc
 pkg
+test/integration/fixtures/log/*
+test/integration/fixtures/log/**/*
+test/unit/fixtures/rails/*
+test/unit/fixtures/rails/**/*
+test/unit/fixtures/standalone/*
+test/unit/fixtures/standalone/**/*
 
 ## PROJECT::SPECIFIC
 .loadpath

data/README.rdoc

@@ -8,7 +8,7 @@ Maestro currently supports the Amazon Web Services cloud. Support for other clou
 
 Maestro currently supports the following Linux distributions:
 
- Ubuntu (9.10, 9.04, 8.10, 8.04)
+ Ubuntu (10.04, 9.10, 9.04, 8.10, 8.04)
  Debian (6.0, 5.0)
  Fedora (8)
  CentOS (5.4)
@@ -22,14 +22,24 @@ Add the following gem dependency to your Rails project's <code>config/environmen
 
     Rails::Initializer.run do |config|
 
-      config.gem "the-maestro", :version => '0.2.0'
+      config.gem "the-maestro", :lib => "maestro", :version => "0.3.0", :source => "http://gemcutter.org"
 
     end
 
+Then run the following to install the Maestro gem:
+
+    sudo rake gems:install
+
+You may optionally unpack Maestro into vendor/gems by running:
+
+    sudo rake gems:unpack:dependencies
+
 You'll interact with Maestro through custom Rake tasks that Maestro adds to your Rails project. Until {this}[https://rails.lighthouseapp.com/projects/8994/tickets/59] Rails issue is resolved, you'll need to add this to your Rails project's Rakefile:
 
     require 'maestro/tasks'
 
+Make sure the Maestro gem in successfully installed before adding this line to your Rails project's Rakefile.
+
 === Configuration
 
 To create the Maestro configuration directory structure, run the following Rake task:
@@ -106,17 +116,21 @@ that these capabilities are enabled in your Amazon Web Services account. See the
 
 Let's look at each of these sections in more detail:
 
-===== aws_cloud <i>cloud_name</i> do
+==== aws_cloud <i>cloud_name</i>
 
 The aws_cloud method declares an Amazon Web Services cloud with the given name. The cloud name can be either a symbol or a string.
 
   aws_cloud :dev do
+     ...
+  end
 
   aws_cloud "dev" do
+     ...
+  end
 
 A cloud name may only contain alphanumerics and dashes.
 
-===== AWS cloud attributes
+==== aws_cloud attributes
 
 The following attributes must be present after your aws_cloud declaration:
 
@@ -128,10 +142,11 @@ The following attributes must be present after your aws_cloud declaration:
 - <b>chef_bucket</b>: The name of the Amazon S3 Bucket where you want your Chef recipes and roles stored. If this Bucket does not exist, Maestro will create it for you. Please note that the Bucket itself, and all objects stored within the Bucket use the canned 'private' access policy, meaning no one but the Bucket owner (i.e. you) may access the Bucket or the objects within it. Maestro uses query string authentication when accessing the objects to ensure the integrity of your data.
 
 
-===== roles do
+==== roles
 The <code>roles</code> method allows you to apply configuration to all of the nodes in your cloud which are in a given role, rather than repeating that configuration for all nodes individually.
 
-===== role <i>role_name</i> do
+==== role <i>role_name</i>
+
 A role corresponds to a Chef role that the configurable nodes in your Cloud can play. A role name may either be a symbol or a string.
 
     role "web" do
@@ -140,21 +155,21 @@ A role corresponds to a Chef role that the configurable nodes in your Cloud can
 
 A role name may only contain alphanumerics and dashes.
 
-===== role attributes
+==== role attributes
 
 A role may configure the following attributes:
 
 - <b>public_ports</b>: The ports that should be open to the public internet, for example ports 80 and 443 for a web role. The value of this attribute must be an array of integers.
 
 
-===== nodes do
+==== nodes
 The <code>nodes</code> method is where you define the nodes (servers, machine, VMs, devices, etc…) in your cloud.
 
-===== AWS Node types
+==== AWS Node types
 
 The following are the AWS node types supported by Maestro:
 
-<b><code>ec2_node <i>node-name</i> do</code></b>
+==== ec2_node <i>node-name</i>
 
 Creates an Elastic Cloud Compute (EC2) node. An EC2 node name may only contain alphanumerics and dashes.
 
@@ -186,7 +201,7 @@ An example ec2_node:
     end
 
 
-<b><code>elb_node <i>node-name</i> do</code></b>
+==== elb_node <i>node-name</i>
 
 Creates an Elastic Load Balancer (ELB) node. An ELB node name may only contain alphanumerics and dashes.
 
@@ -207,7 +222,7 @@ An example elb_node:
     end
 
 
-<b><code>rds_node <i>node-name</i> do</code></b>
+==== rds_node <i>node-name</i>
 
 Creates a Relational Database Service (RDS) node. An RDS node name may only contain alphanumerics and dashes.
 
@@ -247,7 +262,7 @@ An example rds_node:
     end
 
 
-===== A note about node definitions
+==== A note about node definitions
 
 If your cloud has a large number of nodes which are identical other than their name, defining each node individually with a node method would be tedious.
 Don't forget that your cloud definition files are Ruby, which allows you to do things like the following:

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/maestro/cloud.rb

@@ -323,9 +323,17 @@ module Maestro
       def open_ssh_session(cnodes=[])
         handler = Proc.new do |server|
           server[:connection_attempts] ||= 0
-          if server[:connection_attempts] < 50
+          if server[:connection_attempts] < 6
             server[:connection_attempts] += 1
-            sleep 2
+            the_node = nil
+            @configurable_nodes.each_pair {|name, node| the_node = node if server.host.eql? node.hostname}
+            if the_node.nil?
+              @logger.error "Could not find node matching hostname #{server.host}. This should not happen."
+              throw :go, :raise
+            else
+              @logger.info "Could not connect to Node #{the_node.name}. Trying again in 10 seconds..."
+            end
+            sleep 10
             throw :go, :retry
           else
             throw :go, :raise

data/lib/maestro/operating_system.rb

@@ -5,7 +5,9 @@ module Maestro
     # if the operating system cannot be determined or is unsupported by Maestro.
     def self.create_from_etc_issue(etc_issue_str)
       raise StandardError, "Invalid etc_issue_str" if (etc_issue_str.nil? || etc_issue_str.empty?)
-      if etc_issue_str.include?("Ubuntu 9.10")
+      if etc_issue_str.include?("Ubuntu 10.04")
+        Ubuntu1004.new(etc_issue_str)
+      elsif etc_issue_str.include?("Ubuntu 9.10")
         Ubuntu910.new(etc_issue_str)
       elsif etc_issue_str.include?("Ubuntu 9.04")
         Ubuntu904.new(etc_issue_str)

data/lib/maestro/operating_system/ubuntu.rb

@@ -21,22 +21,32 @@ module Maestro
       end
     end
 
+    # The Ubuntu 10.04 Linux distro
+    class Ubuntu1004 < Ubuntu
+      def initialize(etc_issue_str)
+        super(etc_issue_str)
+        # http://alestic.com/2009/11/ec2-karmic-desktop#comment-237
+        @chef_install_script =
+          ["sh -c 'export DEBIAN_FRONTEND=noninteractive; sudo apt-get update -y'",
+           "sh -c 'export DEBIAN_FRONTEND=noninteractive; sudo -E apt-get upgrade -y'",
+           "sh -c 'export DEBIAN_FRONTEND=noninteractive; sudo apt-get install -y ruby irb ri rdoc libyaml-ruby and libzlib-ruby build-essential libopenssl-ruby ruby1.8-dev wget'",
+           "sudo mkdir -p /usr/local/src",
+           "sudo wget -P /usr/local/src http://rubyforge.org/frs/download.php/69365/rubygems-1.3.6.tgz",
+           "sudo tar zxf /usr/local/src/rubygems-1.3.6.tgz -C /usr/local/src",
+           "sudo ruby /usr/local/src/rubygems-1.3.6/setup.rb",
+           "sudo rm /usr/local/src/rubygems-1.3.6.tgz",
+           "sudo ln -sfv /usr/bin/gem1.8 /usr/bin/gem",
+           "sudo gem sources -a http://gems.opscode.com",
+           "sudo gem install rake --no-rdoc --no-ri",
+           "sudo gem install chef --no-rdoc --no-ri --version '= 0.8.14'",
+           "sudo ln -sfv $(gem environment gemdir)/gems/chef-0.8.14/bin/chef-solo /usr/bin/chef-solo"]
+      end
+    end
 
     # The Ubuntu 9.10 Linux distro
     class Ubuntu910 < Ubuntu
       def initialize(etc_issue_str)
         super(etc_issue_str)
-        # Package install (0.7!)
-        # The native package installs install Chef 0.7, not the newest 0.8. Must use rubygem install for now
-        #        @chef_install_script =
-        #          ["sudo apt-get -y dist-upgrade",
-        #           "sudo sh -c \"echo deb http://apt.opscode.com/ karmic universe > /etc/apt/sources.list.d/opscode.list\"",
-        #           "curl http://apt.opscode.com/packages@opscode.com.gpg.key | sudo apt-key add -",
-        #           "sudo apt-get -y update",
-        #           "sudo aptitude -y install ruby ri rdoc libyaml-ruby libzlib-ruby build-essential libopenssl-ruby ruby1.8-dev rubygems ohai chef",
-        #           "sudo gem install rake --no-rdoc --no-ri",
-        #           "sudo /etc/init.d/chef-client stop",
-        #           "sudo chef-solo"]
       end
     end
 
@@ -45,17 +55,6 @@ module Maestro
     class Ubuntu904 < Ubuntu
       def initialize(etc_issue_str)
         super(etc_issue_str)
-        # Package install (0.7!)
-        # The native package installs install Chef 0.7, not the newest 0.8. Must use rubygem install for now
-        #        @chef_install_script =
-        #          ["sudo apt-get -y dist-upgrade",
-        #           "sudo sh -c \"echo deb http://apt.opscode.com/ jaunty universe > /etc/apt/sources.list.d/opscode.list\"",
-        #           "curl http://apt.opscode.com/packages@opscode.com.gpg.key | sudo apt-key add -",
-        #           "sudo apt-get -y update",
-        #           "sudo aptitude -y install ruby ri rdoc libyaml-ruby libzlib-ruby build-essential libopenssl-ruby ruby1.8-dev rubygems ohai chef",
-        #           "sudo gem install rake --no-rdoc --no-ri",
-        #           "sudo /etc/init.d/chef-client stop",
-        #           "sudo chef-solo"]
       end
     end
 
@@ -64,17 +63,6 @@ module Maestro
     class Ubuntu810 < Ubuntu
       def initialize(etc_issue_str)
         super(etc_issue_str)
-        # Package install (0.7!)
-        # The native package installs install Chef 0.7, not the newest 0.8. Must use rubygem install for now
-        #        @chef_install_script =
-        #          ["sudo apt-get -y dist-upgrade",
-        #           "sudo sh -c \"echo deb http://apt.opscode.com/ intrepid universe > /etc/apt/sources.list.d/opscode.list\"",
-        #           "curl http://apt.opscode.com/packages@opscode.com.gpg.key | sudo apt-key add -",
-        #           "sudo apt-get -y update",
-        #           "sudo aptitude -y install ruby ri rdoc libyaml-ruby libzlib-ruby build-essential libopenssl-ruby ruby1.8-dev rubygems ohai chef",
-        #           "sudo gem install rake --no-rdoc --no-ri",
-        #           "sudo /etc/init.d/chef-client stop",
-        #           "sudo chef-solo"]
       end
     end
 
@@ -83,17 +71,6 @@ module Maestro
     class Ubuntu804 < Ubuntu
       def initialize(etc_issue_str)
         super(etc_issue_str)
-        # Package install (0.7!)
-        # The native package installs install Chef 0.7, not the newest 0.8. Must use rubygem install for now
-        #        @chef_install_script =
-        #          ["sudo apt-get -y dist-upgrade",
-        #           "sudo sh -c \"echo deb http://apt.opscode.com/ hardy universe > /etc/apt/sources.list.d/opscode.list\"",
-        #           "curl http://apt.opscode.com/packages@opscode.com.gpg.key | sudo apt-key add -",
-        #           "sudo apt-get -y update",
-        #           "sudo aptitude -y install ruby ri rdoc libyaml-ruby libzlib-ruby build-essential libopenssl-ruby ruby1.8-dev rubygems ohai chef",
-        #           "sudo gem install rake --no-rdoc --no-ri",
-        #           "sudo /etc/init.d/chef-client stop",
-        #           "sudo chef-solo"]
       end
     end
   end

data/test/integration/test_ubuntu.rb

@@ -13,6 +13,8 @@ class TestUbuntu < Test::Unit::TestCase
     #######################
 
     setup do
+      ENV[Maestro::MAESTRO_DIR_ENV_VAR] = File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures')
+      Maestro.create_log_dirs
       credentials = @credentials
       @cloud = aws_cloud :maestro_ubuntu_itest do
         keypair_name credentials[:keypair_name]
@@ -79,6 +81,9 @@ class TestUbuntu < Test::Unit::TestCase
       cloud_security_groups.each do |group_name|
         @ec2.delete_security_group(:group_name => group_name)
       end
+
+      FileUtils.rm_rf([Maestro.maestro_log_directory], :secure => true) if File.exists?(Maestro.maestro_log_directory)
+      ENV.delete Maestro::MAESTRO_DIR_ENV_VAR
     end
 
 
@@ -86,6 +91,21 @@ class TestUbuntu < Test::Unit::TestCase
     # Tests
     #######################
 
+    context "Ubuntu 10.04" do
+      should "install chef-solo" do
+        @node.ami "ami-2d4aa444"
+        @node.ssh_user "ubuntu"
+        assert_nothing_raised do
+          @cloud.connect!
+          @cloud.start
+          @cloud.get_configurable_node_hostnames
+          assert !@cloud.chef_solo_installed?[0]
+          @cloud.install_chef_solo
+          assert @cloud.chef_solo_installed?[0]
+        end
+      end
+    end
+
     context "Ubuntu 9.10" do
       should "install chef-solo" do
         @node.ami "ami-bb709dd2"

data/the-maestro.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{the-maestro}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Ploetz"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: the-maestro
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Brian Ploetz