stemcell 0.0.3 → 0.0.4

data/bin/stem

@@ -16,7 +16,7 @@ END_OF_BANNER
       "aws access key",
       :type => String,
       :default => ENV['AWS_ACCESS_KEY']
-      )  
+      )
 
   opt('aws_secret_key',
       "aws secret key",
@@ -24,18 +24,6 @@ END_OF_BANNER
       :default => ENV['AWS_SECRET_KEY']
       )
 
-  opt('chef_validation_key_name',
-      'chef validation key name',
-      :type => String,
-      :default => ENV['CHEF_VALIDATION_KEY_NAME'],
-      )
-
-  opt('chef_validation_key',
-      'chef validation key path',
-      :type => String,
-      :default => ENV['CHEF_VALIDATION_KEY'],
-      )
-
   opt('chef_data_bag_secret',
       'path to chef data bag encryption secret',
       :type => String,
@@ -48,10 +36,22 @@ END_OF_BANNER
       :default => ENV['CHEF_ROLE'],
       )
 
-  opt('chef_environment',
-      'chef environment of instance to be launched',
+  opt('git_branch',
+      'git branch to run off',
+      :type => String,
+      :default => ENV['GIT_BRANCH'],
+      )
+
+  opt('git_key',
+      'git key to use',
+      :type => String,
+      :default => ENV['GIT_KEY'],
+      )
+
+  opt('git_origin',
+      'git origin to use',
       :type => String,
-      :default => ENV['CHEF_ENVIRONMENT'],
+      :default => ENV['GIT_ORIGIN'],
       )
 
   opt('key_name',
@@ -95,15 +95,15 @@ end
 required_parameters = [
                        'aws_access_key',
                        'aws_secret_key',
-                       'chef_validation_key_name',
-                       'chef_validation_key',
                        'chef_role',
-                       'chef_environment',
+                       'git_branch',
+                       'git_key',
+                       'git_origin',
                        'key_name',
                       ]
 
 required_parameters.each do |arg|
-  raise ArgumentError, "--#{arg} needs to be specified on the commandline or set \
+  raise ArgumentError, "--#{arg.gsub('_','-')} needs to be specified on the commandline or set \
 by the #{arg.upcase.gsub('-','_')} environment variable" if
     options[arg].nil? or ! options[arg]
 end

data/lib/stemcell/templates/bootstrap.sh.erb

@@ -2,7 +2,8 @@
 #
 # This script will bootstrap and run chef
 #
-# You need to specify a run_list, environment, and validator key info below
+# You need to specify a role, origin, git_key, branch name, and data
+# bag secret info below
 #
 # Martin Rhoads
 
@@ -10,6 +11,13 @@
 set -o pipefail
 
 
+# ensure we were called by root
+if [ $UID != 0 ]; then
+  echo "this script needs to be run as root. exiting..."
+  exit 1
+fi
+
+
 # redirect stdout to /var/log/init
 exec > /var/log/init
 
@@ -22,11 +30,13 @@ exec 2> /var/log/init.err
 ##
 
 
-run_list=role[<%= @chef_role %>]
-environment=<%= @chef_environment %>
-validator_name=<%= @chef_validation_key_name %>
-validator_value="<%= @chef_validation_key_value %>"
-data_bag_secret="<%= @chef_data_bag_secret %>"
+repo_dir=/etc/chef/src
+role=<%= @chef_role %>
+origin=<%= @git_origin %>
+branch=<%= @git_branch %>
+git_key='<%= @git_key_contents %>'
+data_bag_secret='<%= @chef_data_bag_secret %>'
+
 
 ##
 ## common function
@@ -54,40 +64,77 @@ get_instance_id() {
 }
 
 
+install_chef() {
+  if ! which chef-solo > /dev/null ; then 
+    echo installing chef via omnibus...
+    curl -L --silent https://www.opscode.com/chef/install.sh | sudo bash -s -- -v 11.2.0  1>&2
+  else 
+    echo chef is already installed
+  fi
+}
+
+
 configure_chef() {
   echo configuring chef...
   mkdir -p /etc/chef
-  echo -e  "$validator_value" > /etc/chef/validation.pem
-  cat<<EOF>/etc/chef/client.rb
+  cat<<EOF>/etc/chef/solo.json
+{
+  "run_list": "role[$role]"
+}
+EOF
+
+  cat<<EOF>/etc/chef/solo.rb
 log_level        :info
 log_location     STDOUT
-chef_server_url  "https://api.opscode.com/organizations/airbnb"
-validation_client_name "$validator_name"
-node_name "$instance_id"
+cookbook_path "$repo_dir/cookbooks"
+role_path "$repo_dir/roles"
+data_bag_path "$repo_dir/data_bags"
+json_attribs '/etc/chef/solo.json'
 EOF
   echo -e "$data_bag_secret" > /etc/chef/encrypted_data_bag_secret
   echo chef configured
 }
 
 
-install_chef() {
-  if ! which chef-client > /dev/null ; then 
-    echo installing chef via omnibus...
-    curl -L --silent https://www.opscode.com/chef/install.sh | sudo bash 1>&2
-    curl -L --silent https://www.opscode.com/chef/install.sh | sudo bash -s -- -v 11.2.0  1>&2
-  else 
-    echo chef is already installed
+update_repo() {
+  git_wrapper=/etc/chef/git_wrapper
+  local keyfile=/etc/chef/git_key
+  if [ -d $repo_dir ]; then 
+    echo updating source...
+    (cd $repo_dir && GIT_SSH=$git_wrapper git pull && git reset --hard && git clean -fdx)
+  else
+    echo -e "$git_key" > $keyfile
+    chmod 0400 $keyfile
+    echo "ssh -i $keyfile  -o StrictHostKeyChecking=no \$1 \$2" > $git_wrapper
+    chmod 0500 $git_wrapper
+    echo downloading cookbook repo...
+    GIT_SSH=$git_wrapper git clone --branch $branch --depth 1 $origin $repo_dir
   fi
+  echo done updating code
+}
+
+
+configure_converger() {
+cat<<EOF>/usr/local/bin/converge
+#!/bin/bash -e
+
+cd $repo_dir
+GIT_SSH=$git_wrapper git pull
+git reset --hard
+git clean -fdx
+chef-solo
+EOF
+  chmod 0544 /usr/local/bin/converge
 }
 
 
 configure_chef_daemon() {
-  cat<<EOF>/etc/init/chef-client.conf
-description     "chef-client"
+  cat<<EOF>/etc/init/chef-solo.conf
+description     "chef-solo"
 author          "Martin Rhoads"
 start on networking
 script
-chef-client --interval 300 --splay 150  | logger -t chef-client 2>&1
+chef-solo --interval 600 --splay 600  | logger -t chef-solo 2>&1
 end script
 respawn
 EOF
@@ -95,14 +142,14 @@ EOF
 
 
 run_chef() {
-  echo running chef-client...
-  chef-client --environment $environment --override-runlist $run_list 1>&2
-  echo done running chef-client
+  echo running chef-solo...
+  chef-solo 1>&2
+  echo done running chef-solo
 }
 
 
 start_chef_daemon() {
-  start chef-client
+  start chef-solo
 }
 
 
@@ -114,12 +161,15 @@ start_chef_daemon() {
 echo starting chef bootstrapping...
 update
 install curl
+install git
 get_instance_id
-configure_chef
 install_chef
+configure_chef
+update_repo
+configure_converger
 run_chef
 configure_chef_daemon
-start_chef_daemon
+# start_chef_daemon
 
 
 ##

data/lib/stemcell/version.rb

@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/stemcell.rb

@@ -11,10 +11,10 @@ module Stemcell
       @log.debug "opts are #{opts.inspect}"
       ['aws_access_key',
        'aws_secret_key',
-       'chef_validation_key_name',
-       'chef_validation_key',
        'chef_role',
-       'chef_environment',
+       'git_branch',
+       'git_key',
+       'git_origin',
        'key_name',
       ].each do |req|
         raise ArgumentError, "missing required param #{req}" unless opts[req]
@@ -30,11 +30,11 @@ module Stemcell
       @start_time = Time.new
 
       begin
-        @chef_validation_key_value = File.read(@chef_validation_key)
+        @git_key_contents = File.read(@git_key)
       rescue Object => e
         # TODO(mkr): we may want to do something better here
-        @chef_validation_key_value = @chef_validation_key
-        # raise "\ncould not open specified key #{@chef_validation_key}:\n#{e.inspect}#{e.backtrace}"
+        @git_key_contents = @chef_validation_key
+        # raise "\ncould not open specified key #{@git_key}:\n#{e.inspect}#{e.backtrace}"
       end
 
       if opts['chef_data_bag_secret']
@@ -50,7 +50,6 @@ module Stemcell
       AWS.config({:access_key_id => @aws_access_key, :secret_access_key => @aws_secret_key})
       @ec2 = AWS::EC2.new(:ec2_endpoint => @ec2_url)
       @ec2_region = @ec2.regions[@region]
-
       @user_data = render_template
     end
 
@@ -59,16 +58,11 @@ module Stemcell
       instances = do_launch(opts)
       wait(instances)
       print_run_info(instances)
-      print_config_info
       return instances
     end
 
     private
 
-    def print_config_info
-      puts "install logs will be in /var/log/init and /var/log/init.err"
-    end
-
     def print_run_info(instances)
       puts "here is the info for what's launched:"
       instances.each do |instance|
@@ -76,6 +70,7 @@ module Stemcell
         puts "\tpublic ip:   #{instance.public_ip_address}"
         puts
       end
+      puts "install logs will be in /var/log/init and /var/log/init.err"
     end
 
     def wait(instances)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop