stemcell 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: a75498d7efc84297470587517941d2c008fb5e3c
-  data.tar.gz: 78e9281f72c7cd72c03da98aa0041bb1969ac7b9
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzZkYjUzZGU4NDA1OTQwYTk4Y2Y1YmM3M2M0NmVhYzFmOTc1NWRhMQ==
+  data.tar.gz: !binary |-
+    ODZiYTA3ZjI3MTA3ZWM3YTI2NzUzOWYzMWZkYWMwOGU3NjA0M2UyNA==
 SHA512:
-  metadata.gz: b0b8832be4df37d3599639f88bd093e1924e3ceada6bb0daec655276935fd3b63dd2d42e1df40404c5b867cc64bdacb50174231e85edef80d531c2cd5ee88dae
-  data.tar.gz: c4df4499b664495dc4d94b0ad9188562aa030b0025783f1040fae4a3a21db5908f5dbb660e0286dd11c0bf31f14ca70b419c3b3a7e10a5037eea0e37ce2abb51
+  metadata.gz: !binary |-
+    YWE5MTJmMWI0NGMwYzFmZmU3YjkyYWVhMzEzY2YwNmEyZjM1NWVmYTk0ODRl
+    ZGEyMTQ4NDNiNDBhODUxZTRmNzlkNWNhNTI1MTg2Y2NiMmNhNzIzZWNlNmZk
+    ZDhiNjI1OTY1YjhjZTU5YjM0ZDE2ZWZiYTQ5ZTIyMGFjNTg2Yzg=
+  data.tar.gz: !binary |-
+    YWNhMDZhMTdhMjEyZjEyYTNmMzM2MjljMTJjOGFmYWFmN2M1NzI3N2Y0ZDll
+    ZGRhZmExN2YyYTlkN2ZhZWY1ZmNiODU0NWE1MjM4YzRkYjU2OGUzMTVlYTcy
+    YTQyNjZlNjZlNjE4Y2YzYzI0ZjRkZWJjOTUzNmE0M2NlNWVhODU=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.11.1
+- update bootstrap.sh to support launched_by file, site-cookbooks, ohai_plugins, and retries if the initial converge fails
+- include version in version string
+
 # 0.11.0
 - allow user to specify `contexts` to override certain attributes
 

data/lib/stemcell/command_line.rb

@@ -8,7 +8,7 @@ module Stemcell
     attr_reader :chef_root
     attr_reader :chef_role
 
-    VERSION_STRING = "Stemcell (c) 2012-2013 Airbnb."
+    VERSION_STRING = "Stemcell #{VERSION} (c) 2012-2016 Airbnb."
     BANNER_STRING  = "Launch instances from metadata stored in roles!\n" \
                      "Usage: stemcell [chef role] [options]"
 

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

@@ -1,12 +1,6 @@
 #!/bin/bash -e
 #
 # This script will bootstrap and run chef
-#
-# You need to specify a role, origin, git_key, branch name, and data
-# bag secret info below
-#
-# Martin Rhoads
-
 
 (
 echo 'Acquiring converge lock...'
@@ -16,14 +10,12 @@ echo 'Lock acquired!'
 set -o pipefail
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
-
 # 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
 
@@ -36,6 +28,14 @@ exec 2>> /var/log/init.err
 ##
 
 chef_dir=/etc/chef
+repo_dir=${chef_dir}/src
+keyfile=${chef_dir}/git_key
+envfile=${chef_dir}/environment
+launchedbyfile=${chef_dir}/launched_by
+rolefile=${chef_dir}/role
+branchfile=${chef_dir}/branch
+originfile=${chef_dir}/origin
+git_wrapper=${chef_dir}/git_wrapper
 converge=/usr/local/bin/first_converge
 role=<%= opts['chef_role'] %>
 environment=<%= opts['chef_environment'] %>
@@ -46,19 +46,18 @@ data_bag_secret='<%= opts["chef_data_bag_secret"] %>'
 hostname='<%= opts['instance_hostname'] %>'
 domain_name='<%= opts['instance_domain_name'] %>'
 chef_version='<%= opts['chef_version'] %>'
+username='<%= opts.fetch('user', ENV['USER']) %>'
 
 
 ##
-## common function
+## common functions
 ##
 
-
 update() {
   echo updating apt repo
   apt-get update 1>&2
 }
 
-
 install() {
   if ! (dpkg -l | awk '{print $2}' | grep -q ^$1$ ) ; then
     echo installing $1...
@@ -67,7 +66,6 @@ install() {
   fi
 }
 
-
 set_hostname() {
   instance_id=`curl --silent --retry 5 --retry-delay 5 169.254.169.254/latest/meta-data/instance-id` 1>&2
   local_ip=`curl --silent --retry 5 --retry-delay 5 169.254.169.254/latest/meta-data/local-ipv4` 1>&2
@@ -130,7 +128,6 @@ update_repo() {
   echo "done updating code"
 }
 
-
 configure_chef() {
   echo "saving current origin ($origin), branch ($branch), role ($role), and environment ($environment)"
   echo "$origin" > $originfile
@@ -145,16 +142,21 @@ configure_chef() {
   echo "$environment" > $envfile
   chmod 644 $envfile
 
+  echo "$username" > $launchedbyfile
+  chmod 644 $launchedbyfile
+
   echo "configuring chef solo..."
   cat<<EOF > ${chef_dir}/solo.rb
-repo_dir =    "${repo_dir}"
-cookbook_path "#{repo_dir}/cookbooks"
-role_path     "#{repo_dir}/roles"
+repo_dir = "${repo_dir}"
+
+cookbook_path ["#{repo_dir}/site-cookbooks", "#{repo_dir}/cookbooks"]
+role_path "#{repo_dir}/roles"
 data_bag_path "#{repo_dir}/data_bags"
 ssl_verify_mode :verify_peer
+log_level :info
+log_location STDOUT
 
-log_level        :info
-log_location     STDOUT
+Ohai::Config[:plugin_path] << "#{repo_dir}/ohai_plugins"
 EOF
 
   encrypted_data_bag_secret_file=${chef_dir}/encrypted_data_bag_secret
@@ -164,8 +166,7 @@ EOF
   echo "chef configured"
 }
 
-
-configure_converger() {
+configure_converge() {
   cat<<EOF > $converge
 #!/bin/bash -eu
 
@@ -198,27 +199,28 @@ EOF
   chmod 544 $converge
 }
 
-configure_chef_daemon() {
-  cat<<EOF > /etc/init/chef-solo.conf
-description     "chef-solo"
-author          "Martin Rhoads"
-start on networking
-script
-chef-solo --interval 600 --splay 600  | logger -t chef-solo 2>&1
-end script
-respawn
-EOF
-}
-
-
 run_chef() {
-  echo "doing initial chef run..."
-  $converge 1>&2
-  echo "initial chef run complete"
-}
+  set +e # unset e to allow retries
+  converge_succeed=false
+  for atmpt in $(seq 1 3);
+  do
+    echo "doing initial chef run... (attempt $atmpt)"
+    $converge 1>&2
+    if [ $? -eq 0 ]; then
+      converge_succeed=true
+      break
+    fi
+  done
+
+  if [ $converge_succeed == true ]; then
+    echo "initial chef run completes successfully"
+  else
+    echo "****************************************"
+    echo "*  WARNING: initial converge failed!   *"
+    echo "****************************************"
+  fi
 
-start_chef_daemon() {
-  start chef-solo
+  set -e
 }
 
 
@@ -226,17 +228,7 @@ start_chef_daemon() {
 ## main
 ##
 
-#some derived vars
-repo_dir=${chef_dir}/src
-keyfile=${chef_dir}/git_key
-envfile=${chef_dir}/environment
-rolefile=${chef_dir}/role
-branchfile=${chef_dir}/branch
-originfile=${chef_dir}/origin
-git_wrapper=${chef_dir}/git_wrapper
-
 echo "starting chef bootstrapping..."
-mkdir -p ${chef_dir}
 update
 install curl
 install git
@@ -245,17 +237,7 @@ install_chef
 create_ohai_hint
 update_repo
 configure_chef
-configure_converger
+configure_converge
 run_chef
-
-configure_chef_daemon
-# start_chef_daemon
-
-
-##
-## exit
-##
-
-
 echo "<%= last_bootstrap_line %>"
 ) 200> /var/run/converge.lock

data/lib/stemcell/version.rb

@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Martin Rhoads
@@ -11,118 +11,124 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.63'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.63'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 11.4.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 12.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 11.4.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: aws-creds
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.2
 description: A tool for launching and bootstrapping EC2 instances
@@ -134,8 +140,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -196,17 +202,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: no summary