refactor

Author: davidx

.gitignore

@@ -0,0 +1,2 @@
+*.gem
+idea*

Capfile

@@ -1,6 +1,7 @@
 $:.unshift(File.dirname(__FILE__) + '/lib')
 
-require 'data_provider'
+require 'overcast/data_provider'
+require 'overcast/configuration'
 
 
 groups.each { |group|
@@ -21,36 +22,34 @@ set :repository, "[email protected]:davidx/overcast.git"
 set :timestamp, Time.now.strftime("%s")
 set :release_path, "#{dataroot}/releases/#{timestamp}"
 
-set :bootstrap_packages, %w[
-                              dev-vcs/git
-                              dev-lang/ruby
-                              rubygems
-                          ]
-set :bootstrap_gems, %w[
-                              rake
-                              ohai
-                              chef
-                              choice
-                              rvm
-                              bundler
-                          ]
 
-namespace :overcast do
 
+def emerge(packages=[])
+  run "emerge #{packages.join(" ")}"
+end
+
+def gem_install(gems=[])
+  run "gem install #{gems.join(' ')} --no-ri --no-rdoc"
+end
+
+
+  def run_commands(commands)
+    commands.each{ |c| "echo [command:][#{c}] && echo [result:][#{`#{c}`}]" }.join(" && ")
+  end
+
+namespace :overcast do
   task :bootstrap do
-    run "emerge --sync"
-    run "emerge portage"
-    run "etc-update"
-    run "emerge #{bootstrap_packages.join(' ')}"
-    run "gem install #{bootstrap_gems.join(' ')} --no-ri --no-rdoc"
-    run "rvm-install"
-    # run "echo '[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm' >> ~/.bashrc"
-    #  this is to bypass the [email protected] ssh yes/no question, todo add not_if or echo "y\r\n"
+    run_commands bootstrap_commands
+    emerge bootstrap_packages
+    gem_install bootstrap_gems
+    strict_host_key_prehack
+  end
+  task :strict_host_key_prehack do
+    # initial alter to allow git repo pull after which ssh_config is rendered from recipe
     run "su - -c \"echo 'StrictHostKeyChecking no' >> /etc/ssh/ssh_config\" "
   end
 
-
-  task :deploy, :role => :app do
+  task :deploy do
     cmd = ["mkdir -p #{dataroot}/releases"]
     cmd << "cd #{dataroot} && git clone #{repository} #{release_path}"
     cmd << "rm -f #{dataroot}/current"
@@ -61,9 +60,8 @@ namespace :overcast do
     update
     solo
   end
-  def run_commands(commands)
-    commands.collect{|c| "echo [command:][#{c}] && echo [result:][#{`#{c}`}]" }.join(" && ")
-  end
+
+
   task :solo do
     profile  = ENV.key?('PROFILE') ? ENV['PROFILE'] : 'default'
 
@@ -77,7 +75,7 @@ namespace :overcast do
     run "cd #{chefroot} && #{git_command}"
   end
   task :grow do
-    profile  = ENV.key?('PROFILE') ? ENV['PROFILE'] : 'default'
+    profile = ENV.key?('PROFILE') ? ENV['PROFILE'] : 'default'
     system "ruby bin/grow.rb --profile=#{profile}"
   end
 end

Gemfile

@@ -1,4 +1,5 @@
 source :gemcutter
 gem 'choice'
 gem 'fog'
-gem 'amazon-ec2'
+gem 'amazon-ec2'
+gem 'net-ssh'

bin/grow.rb

@@ -7,18 +7,14 @@
 require 'net/ssh'
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'data_provider'
+require 'overcast/configuration'
+require 'overcast/data_provider'
 
-main_config_file = File.dirname(__FILE__) + '/../config/cloud.yml'
-credential_config_file = ENV['HOME'] + '/.fog'
+main_config= Overcast::Configuration.read
 
-[main_config_file, credential_config_file].each do |config_file|
-  unless File.exists?(config_file)
-    p "please create the config file #{config_file} "
-    exit 1
-  end
-end
-config = YAML.load(IO.read(main_config_file))
+credentials = Overcast::Configuration.credentials
+EC2 = Overcast::DataProvider::Ec2
+RDS = Overcast::DataProvider::RDS
 
 Choice.options do
   header ''
@@ -27,9 +23,8 @@
   option :profile, :required => true do
     short '-p'
     long '--profile=PROFILE'
-    desc "The profile name, determines ami and post install configuration. (required)
-  #{IO.read(main_config_file)}"
-    default 'tester'
+    desc "The profile name, determines ami and post install configuration. (required)"
+    default 'default'
   end
   option :bootstrap do
     short '-b'
@@ -41,51 +36,44 @@
     short '-k'
     long '--key=KEY'
     desc 'The key name'
-    default config[:defaults][:key_name]
+    default main_config[:defaults][:key_name]
   end
 end
 
 choices = Choice.choices
 
 
-profile = choices[:profile]
-key_name = choices[:key_name]
-
-unless config[:profiles].key?(profile.to_sym)
-  p "no such profile defined in config, please define a profile"
-  exit 1
-end
-
-defaults = config[:defaults]
-profile_server_config = config[:profiles][profile.to_sym]
-profile_server_config = defaults.merge(profile_server_config)
-profile_server_config[:key_name] = key_name
+server = Overcast::Ec2.launch_instance(
+                    Overcast::Configuration.get_config_for_profile(choices[:profile])
+        )
 
-print profile_server_config.inspect if ENV.key?('DEBUG')
 
+Overcast.bootstrap_server_instance(server)
 
-print "launching instance of profile #{profile} #{profile_server_config.to_yaml}"
-roles = profile_server_config.delete(:roles)
 
-server = EC2.servers.create(profile_server_config)
-print "Please wait while your #{profile} instance is allocated\n"
-server.wait_for { print "."; ready? }
+Net::SSH.start( server.ip_address, 'root',
+                :forward_agent =>true,
+                :keys =>["#{ENV['HOME']}/.ec2/#{choices[:key_name]}"] ) do |session|
 
-print "\n"
-puts "Public IP Address: #{server.ip_address}"
-puts "Private IP Address: #{server.private_ip_address}"
+  shell = session.shell.sync
 
-puts "key is #{key_name}"
+  out = shell.pwd
+  p out.stdout
 
-p 'sleeping 60 to let it bootup properly'
-sleep 60
+  out = shell.uptime
+  p out.stdout
+  p out.status
 
-command = ['eval `ssh-agent`']
-command << "ssh-add ~/.ec2/#{key_name}"
-command << "cap overcast:deploy HOSTS=#{server.ip_address}"
-command << "cap overcast:runsolo HOSTS=#{server.ip_address} PROFILE=#{profile}"
+  p shell.exit
 
-fullcommand = command.join(" && ")
-p fullcommand
+end
 
-system(fullcommand)
+#command = ['eval `ssh-agent`']
+#command << "ssh-add ~/.ec2/#{key_name}"
+#command << "cap overcast:deploy HOSTS=#{server.ip_address}"
+#command << "cap overcast:runsolo HOSTS=#{server.ip_address} PROFILE=#{profile}"
+#
+#fullcommand = command.join(" && ")
+#p fullcommand
+#
+#system(fullcommand)

chef/roles/monitoring.rb

@@ -1,22 +1,37 @@
 name "monitoring"
 description "monitoring role"
 run_list(["recipe[base]", "recipe[nagios]"])
-
+default_users = %{nagios}.join(',')
 
 default_attributes(
     :nagios => {
+        :package => 'nagios-HEAD.tar.gz',
+        :package_source_url => 'http://nagios.sourceforge.net/download/cvs/',
+        :cgi => { :users => { :default => default_users,
+                              :authorized_for_system_information => default_users,
+                              :authorized_for_configuration_information => default_users,
+                              :authorized_for_system_commands => default_users,
+                              :authorized_for_all_services => default_users,
+                              :authorized_for_all_hosts => default_users,
+                              :authorized_for_all_service_commands => default_users,
+                              :authorized_for_all_host_commands => default_users,
+                            },
+                  :html_url_path => '/nagios',
+                },
+        },
         :roles          => {
             :app => {
-                :service_checks => ['http']
+                :service_checks => ['http'],
+                :hosts => Overcast::DataProvider.find_hosts_for_role(:app)
             },
             :smtp => {
-               :service_checks => ['smtp'] 
+               :service_checks => ['smtp'],
+               :hosts => Overcast::DataProvider.find_hosts_for_role(:smtp)                
             }
 
         },
         :contacts       => [
             {
-
                 :name  => 'david',
                 :alias => 'davidx ops',
                 :email =>'[email protected]'

chef/roles/testapp.rb

@@ -0,0 +1,6 @@
+name "testapp"
+description "testapp role"
+run_list(["recipe[ruby_custom]"])
+
+# Attributes applied no matter what the node has set already.
+#override_attributes()

config/overcast.yml

@@ -1,8 +1,8 @@
 :defaults:
   :image_id: ami-6e2eca07
   :flavor_id: m1.small
-  :availability_zone: us-east-1d
-  :key_name: gsg-keypair 
+  :availability_zone: us-east-1a
+  :key_name: bootstrap_hostkey
 :profiles:
   :default:
     :groups:
@@ -17,6 +17,13 @@
     :roles:
       - base
       - app
+  :tester:
+    :image_id: ami-6e2eca07
+    :flavor_id: m1.small
+    :groups:
+      - default
+    :roles:
+      - testapp
 :system_profiles:
   :defaults:
     - app-admin/syslog-ng

lib/overcast.rb

@@ -1,2 +1,5 @@
 require 'overcast/configuration'
 require 'overcast/data_provider'
+require 'overcast/ec2'
+require 'overcast/chef'
+

lib/overcast/chef.rb

@@ -0,0 +1,32 @@
+module Overcast
+  Bootstrap = { :commands =>
+          %w{
+          "emerge --sync"
+          "emerge portage"
+          "etc-update"
+          "rc-update add sshd default"
+          },
+
+          :packages =>
+          %w{
+          dev-vcs/git
+          dev-lang/ruby
+          rubygems
+         },
+
+
+        :gems =>
+          %w{
+          rake
+          ohai
+          chef
+          choice
+          bundler
+        }
+  }
+  class Chef
+    def self.bootstrap
+
+    end
+  end
+end

lib/overcast/configuration.rb

@@ -2,15 +2,33 @@
 
 module Overcast
   class Configuration
-
+   def self.check_exists(file)
+    unless File.exists?(file)
+      p "please create the config file #{file} "
+      exit 1
+    end
+  end
    def self.credentials
      credentials_config_file = ENV['HOME'] + '/.fog'
-     YAML.load(IO.read(credentials_config_file))
+     check_exists credentials_config_file
+     credentials = YAML.load(IO.read(credentials_config_file))
    end
-    def self.read
-      main_config_file = File.dirname(__FILE__) + '/../config/overcast.yml'
+    def self.read_config
+      main_config_file = File.dirname(__FILE__) + '/../../config/overcast.yml'
+      check_exists main_config_file
       YAML.load(IO.read(main_config_file))
     end
+   def self.get_config_for_profile(profile_name)
+     main_config = read_config
+     defaults = main_config[:defaults]
+     unless main_config[:profiles].key?(profile_name.to_sym)
+      raise "no such profile defined in config, please define a profile"
+     end
+      profile_server_config = main_config[:profiles][profile_name.to_sym]
+      profile_server_config = defaults.merge(profile_server_config)
+      profile_server_config[:key_name] = key_name
+      print profile_server_config.inspect if ENV.key?('DEBUG')
+     profile_server_config
+   end  
   end
 end
-