stemcell 0.6.1 → 0.6.2a

data/examples/stemcellrc

@@ -21,8 +21,8 @@ CHEF_ENVIRONMENT=default
 export LOCAL_CHEF_ROOT=/path/to/your/local/chef/repository
 
 # The git origin is the publically-accessible version of the
-#   local chef root; we use a github enterprise server
-export GIT_ORIGIN=git@git.airbnb.com:airbnb/chef.git
+#   local chef root
+export GIT_ORIGIN=git@github.com:airbnb/chef.git
 
 # The git branch to use by default
 export GIT_BRANCH=production

data/lib/stemcell/launcher.rb

@@ -94,6 +94,8 @@ module Stemcell
         'created_by' => opts.fetch('user', ENV['USER']),
         'stemcell' => VERSION,
       }
+      # Short name if we're in production
+      tags['Name'] = opts['chef_role'] if opts['chef_environment'] == 'production'
       tags.merge!(opts['tags']) if opts['tags']
 
       # generate launch options

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

@@ -18,39 +18,12 @@ if [ $UID != 0 ]; then
   exit 1
 fi
 
-## Only run once at a time
-# http://stackoverflow.com/questions/959475/shell-fragment-to-make-sure-only-one-instance-a-shell-script-runs-at-any-given-t
-# slightly modified to use $$
-# to run it I must set +e
-
-SCRIPTNAME=`basename $0`
-PIDFILE=/var/run/${SCRIPTNAME}.pid
-
-set +e
-if [ -f ${PIDFILE} ]; then
-   #verify if the process is actually still running under this pid
-   OLDPID=`cat ${PIDFILE}`
-   RESULT=`ps -ef | grep ${OLDPID} | grep ${SCRIPTNAME}`
-
-   if [ -n "${RESULT}" ]; then
-     echo "Script already running! Exiting"
-     exit 255
-   fi
-
-fi
-### ---
-set -e
-
 
 # redirect stdout to /var/log/init
-exec > /var/log/init
+exec >> /var/log/init
 
 # redirect stderr to /var/log/init.err
-exec 2> /var/log/init.err
-
-#grab pid of this process and update the pid file with it
-echo $$ > ${PIDFILE}
-
+exec 2>> /var/log/init.err
 
 
 ##
@@ -67,6 +40,8 @@ git_key='<%= opts['git_key'] %>'
 data_bag_secret='<%= opts["chef_data_bag_secret"] %>'
 hostname='<%= opts['instance_hostname'] %>'
 domain_name='<%= opts['instance_domain_name'] %>'
+chef_version='<%= opts['chef_version'] %>'
+package_url="<%= opts['chef_package_source'] %>"
 
 
 ##
@@ -110,20 +85,20 @@ set_hostname() {
 }
 
 install_chef() {
-  chef_version=<%= opts['chef_version'] %>
-  platform=`lsb_release -s -i | tr '[:upper:]' '[:lower:]'`
-  platform_version=`lsb_release -s -r`
-  arch=`uname -m`
-  package_url="<%= opts['chef_package_source'] %>"
-
-  package_local="/tmp/chef_${chef_version}.deb"
-  echo "Downloading chef from $package_url"
-  wget $package_url -O $package_local
-
-  echo "Installing chef $chef_version"
-  dpkg -i $package_local
-
-  rm $package_local
+  # check to see if chef is already installed
+  if ! which chef-solo > /dev/null ; then
+    platform=`lsb_release -s -i | tr '[:upper:]' '[:lower:]'`
+    platform_version=`lsb_release -s -r`
+    arch=`uname -m`
+    package_local="/tmp/chef_${chef_version}.deb"
+    echo "Downloading chef from $package_url"
+    wget $package_url -O $package_local
+    echo "Installing chef $chef_version"
+    dpkg -i $package_local
+    rm $package_local
+  else
+    echo chef is already installed
+  fi
 }
 
 update_repo() {
@@ -269,10 +244,4 @@ configure_chef_daemon
 ##
 
 
-if [ -f ${PIDFILE} ]; then
-    rm ${PIDFILE}
-fi
-# I can delete the cron too
-rm -f /etc/cron.d/ec2admin_get_callback1
-
 echo "<%= last_bootstrap_line %>"

data/lib/stemcell/version.rb

@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.6.1"
+  VERSION = "0.6.2a"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.6.1
-  prerelease: 
+  version: 0.6.2a
+  prerelease: 5
 platform: ruby
 authors:
 - Martin Rhoads
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -200,9 +200,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23