provisionator 0.0.6 → 0.0.7

data/lib/provisionator/ec2_launcher.rb

@@ -9,22 +9,23 @@ module Provisionator
     end
 
     def initialize options={}
-      options[:instance_type] ||= ENV['P_INSTANCE_TYPE'] || 'm1.small'
-      options[:no_release] ||= ENV['P_NO_RELEASE']
-      options[:ec2_region] ||= ENV['P_EC2_REGION'] || 'us-east-1'
-      options[:ec2_endpoint] ||= ENV['P_EC2_ENDPOINT'] || "ec2.#{options[:ec2_region]}.amazonaws.com"
-      options[:ami_id] ||= ENV['P_AMI_ID']
-      options[:ebs_volumes] ||= []
-      options[:key_name] ||= ENV['P_KEY_NAME']
-      options[:security_groups] ||= ENV['P_SECURITY_GROUPS'].try(:split, ',')
-      options[:availability_zones] ||= ENV['P_AVAILABILITY_ZONES'].try(:split, ',') || ["us-east-1a","us-east-1b","us-east-1c"]
-      options[:instance_count] ||= ENV['P_INSTANCE_COUNT'].try(:to_i) || 1
-      options[:load_balancer_name] ||= ENV['P_LOAD_BALANCER_NAME']
+      @options = options
+
+      @options[:instance_type] ||= ENV['P_INSTANCE_TYPE'] || 'm1.small'
+      @options[:no_release] ||= ENV['P_NO_RELEASE']
+      @options[:ec2_region] ||= ENV['P_EC2_REGION'] || 'us-east-1'
+      @options[:ec2_endpoint] ||= ENV['P_EC2_ENDPOINT'] || "ec2.#{@options[:ec2_region]}.amazonaws.com"
+      @options[:ami_id] ||= ENV['P_AMI_ID']
+      @options[:ebs_volumes] ||= []
+      @options[:key_name] ||= ENV['P_KEY_NAME']
+      @options[:security_groups] ||= ENV['P_SECURITY_GROUPS'].try(:split, ',')
+      @options[:availability_zones] ||= ENV['P_AVAILABILITY_ZONES'].try(:split, ',') || ec2.regions[@options[:ec2_region]].availability_zones.map(&:name)
+      @options[:instance_count] ||= ENV['P_INSTANCE_COUNT'].try(:to_i) || 1
+      @options[:load_balancer_name] ||= ENV['P_LOAD_BALANCER_NAME']
     
-      [:app_name, :chef_node_definition, :ami_id, :key_name, :security_groups].each do |option|
+      [:app_name, :chef_node, :ami_id, :key_name, :security_groups].each do |option|
         raise "option ':#{option}' is required" if options[option].nil?
       end
-      @options = options
     end
 
     def launch     
@@ -72,7 +73,7 @@ module Provisionator
         puts instance_options.inspect
         instance = ec2.instances.create(instance_options)
 
-        instance.tags['Name'] = "#{@options[:chef_node_definition]}-#{availability_zone.split('').last}-#{instance.id}"
+        instance.tags['Name'] = "#{@options[:app_name]}-#{@options[:chef_node]}-#{availability_zone.split('').last}-#{instance.id}"
         puts "Launching instance '#{instance.id}' in availability_zone '#{availability_zone}...'"
         instance
       end

data/lib/provisionator/ec2_userdata.rb

@@ -3,13 +3,12 @@ require 'erb'
 module Provisionator
   class Ec2Userdata
     def initialize options={}
-      [:app_name, :chef_node_definition, :chef_repo, :config_repo, :app_repo].each do |option|
+      [:app_name, :chef_node, :chef_repo, :config_repo, :app_repo].each do |option|
         raise "option ':#{option}' is required" if options[option].nil?
       end
+      @app_dir = "/home/ubuntu/.#{options[:app_name]}"
+      @chef_dir = "#{@app_dir}/#{options[:chef_dir] || 'provision/chef'}"
 
-      options[:chef_solo_rb_path] ||= "/home/ubuntu/.#{options[:app_name]}/provision/chef/solo.rb"
-      options[:chef_node_definition_base_file] ||= "/home/ubuntu/.#{options[:app_name]}/provision/chef/base.json"
-      options[:chef_node_definition_file] ||= "/home/ubuntu/.#{options[:app_name]}/provision/chef/#{options[:chef_node_definition]}.json"
       options[:ruby_patch] ||= 'p195'
       options[:ebs_mount_paths] = ebs_mount_paths(options[:ebs_volumes]) if options[:ebs_volumes]
       options[:rails_env] ||= 'production'
@@ -45,16 +44,18 @@ exec > >(tee /var/log/user-data.log|logger -t user-data -s 2>/dev/console) 2>&1
 apt-get update
 apt-get upgrade -y
 ntpdate ntp.ubuntu.com
-export LC_CTYPE=en_US.UTF-8
-export LANG=en_US.UTF-8
-unset LC_ALL
 
-echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config
-echo "UserKnownHostsFile=/dev/null" >> /etc/ssh/ssh_config
-echo "gem: --no-ri --no-rdoc" >> /etc/skel/.gemrc
-echo "gem: --no-ri --no-rdoc" >> /root/.gemrc
-echo "gem: --no-ri --no-rdoc" >> /home/ubuntu/.gemrc
-echo "gem: --no-ri --no-rdoc" >> /etc/gemrc
+function add_line_to_file {
+  (test -f "$2" && grep "$1" $2) || echo "$1" >> $2
+}
+
+add_line_to_file "StrictHostKeyChecking no" /etc/ssh/ssh_config
+add_line_to_file "UserKnownHostsFile=/dev/null" /etc/ssh/ssh_config
+
+add_line_to_file "install: --no-document" /etc/skel/.gemrc
+add_line_to_file "install: --no-document" /root/.gemrc
+add_line_to_file "install: --no-document" /home/ubuntu/.gemrc
+add_line_to_file "install: --no-document" /etc/gemrc
 
 #install ruby
 RUBY_PATCH=<%= @options[:ruby_patch] %>
@@ -70,16 +71,19 @@ function install_ruby {
 }
 ruby -v | grep 2.0.0$RUBY_PATCH || install_ruby
 
-#install ruby 2.0 compatible version of chef
-cd /tmp
-curl -o chef.tar.gz -L https://api.github.com/repos/opscode/chef/tarball/CHEF-3935
-tar -xvzf chef.tar.gz
-cd opscode-chef-634ad58
-gem build chef.gemspec
-gem install chef-11.4.0.gem
-gem install ruby-shadow
-mkdir -p /var/cache/chef
-chown ubuntu:ubuntu /var/cache/chef
+function install_chef {
+  #install ruby 2.0 compatible version of chef
+  cd /tmp
+  curl -o chef.tar.gz -L https://api.github.com/repos/opscode/chef/tarball/CHEF-3935
+  tar -xvzf chef.tar.gz
+  cd opscode-chef-634ad58
+  gem build chef.gemspec
+  gem install chef-11.4.0.gem
+  gem install ruby-shadow
+  mkdir -p /var/cache/chef
+  chown ubuntu:ubuntu /var/cache/chef
+}
+gem list | grep chef || install_chef
 
 apt-get install git-core -y
 
@@ -104,8 +108,8 @@ su ubuntu -c 'git clone <%= @options[:app_repo] %> /home/ubuntu/.<%= @options[:a
 ln -s /home/ubuntu/.config/$APP_NAME/<%= @options[:rails_env] %>/app.sh /etc/profile.d/$APP_NAME.sh
 
 . /etc/profile.d/$APP_NAME.sh
-
-chef-solo -c <%= @options[:chef_solo_rb_path] %> -o recipe[base] -l debug
+echo <%= @options[:chef_node] %> > /home/ubuntu/.chef_node
+chown ubuntu:ubuntu /home/ubuntu/.chef_node
 
 <% unless @options[:no_release] %>
   mkdir -p $APP_PATH $APP_PATH/releases $APP_PATH/shared $APP_PATH/shared/system $APP_PATH/shared/log $APP_PATH/shared/pids $APP_PATH/shared/sockets
@@ -120,13 +124,16 @@ chef-solo -c <%= @options[:chef_solo_rb_path] %> -o recipe[base] -l debug
   ln -s $APP_PATH/shared/log $APP_PATH/current/log 
   mkdir $APP_PATH/current/tmp
   ln -s $APP_PATH/shared/pids/ $APP_PATH/current/tmp/pids
+
+  <% if @options[:chef_pre_bundle] %>
+    chef-solo -c <%= "#{@chef_dir}/solo.rb" %> -j <%= "#{@chef_dir}/#{@options[:chef_pre_bundle]}.json" %> -l debug
+  <% end %>
+
   bundle install --gemfile $APP_PATH/releases/20130516070710/Gemfile --path $APP_PATH/shared/bundle --deployment --without development test
   chown -R ubuntu:ubuntu /u/
 <% end %>
 
-echo <%= @options[:chef_node_definition] %> > /home/ubuntu/.chef_node_definition
-chown ubuntu:ubuntu /home/ubuntu/.chef_node_definition
-chef-solo -c <%= @options[:chef_solo_rb_path] %> -j <%= @options[:chef_node_definition_file] %> -l debug
+chef-solo -c <%= "#{@chef_dir}/solo.rb" %> -j <%= "#{@chef_dir}/#{@options[:chef_node]}.json" %> -l debug
 TEMPLATE
     end
   end

data/lib/provisionator/version.rb

@@ -1,3 +1,3 @@
 module Provisionator
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/pre_bootstrap.txt

@@ -0,0 +1,44 @@
+#!/bin/bash -xe
+
+apt-get update
+apt-get upgrade -y
+ntpdate ntp.ubuntu.com
+
+RUBY_PATCH=p195
+function install_ruby {
+  apt-get -y install build-essential zlib1g-dev libssl-dev libreadline-dev libyaml-dev libcurl4-openssl-dev
+  cd /tmp
+  wget ftp://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-$RUBY_PATCH.tar.gz
+  tar -xvzf ruby-2.0.0-$RUBY_PATCH.tar.gz
+  cd ruby-2.0.0-$RUBY_PATCH/
+  ./configure --prefix=/usr/local
+  make
+  make install
+}
+ruby -v | grep 2.0.0$RUBY_PATCH || install_ruby
+
+function install_chef {
+  #install ruby 2.0 compatible version of chef
+  cd /tmp
+  curl -o chef.tar.gz -L https://api.github.com/repos/opscode/chef/tarball/CHEF-3935
+  tar -xvzf chef.tar.gz
+  cd opscode-chef-634ad58
+  gem build chef.gemspec
+  gem install chef-11.4.0.gem
+  gem install ruby-shadow
+  mkdir -p /var/cache/chef
+  chown ubuntu:ubuntu /var/cache/chef
+}
+gem list | grep chef || install_chef
+
+function add_line_to_file {
+  (test -f "$2" && grep "$1" $2) || echo "$1" >> $2
+}
+
+add_line_to_file "StrictHostKeyChecking no" /etc/ssh/ssh_config
+add_line_to_file "UserKnownHostsFile=/dev/null" /etc/ssh/ssh_config
+
+add_line_to_file "install: --no-document" /etc/skel/.gemrc
+add_line_to_file "install: --no-document" /root/.gemrc
+add_line_to_file "install: --no-document" /home/ubuntu/.gemrc
+add_line_to_file "install: --no-document" /etc/gemrc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: provisionator
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -80,6 +80,7 @@ files:
 - lib/provisionator/ec2_launcher.rb
 - lib/provisionator/ec2_userdata.rb
 - lib/provisionator/version.rb
+- pre_bootstrap.txt
 - provisionator.gemspec
 homepage: ''
 licenses:
@@ -96,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3090150088130755826
+      hash: 4334713208859455962
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3090150088130755826
+      hash: 4334713208859455962
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23