stemcell 0.6.0 → 0.6.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stemcell (0.5.0)
+    stemcell (0.6.1)
       aws-creds (~> 0.2.2)
       aws-sdk (~> 1.9)
       chef (~> 11.4.0)
@@ -15,7 +15,7 @@ GEM
   specs:
     aws-creds (0.2.2)
       trollop (~> 2.0)
-    aws-sdk (1.21.0)
+    aws-sdk (1.26.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4, < 1.6.0)
       uuidtools (~> 2.1)
@@ -36,16 +36,16 @@ GEM
     colored (1.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    highline (1.6.19)
+    highline (1.6.20)
     ipaddress (0.8.0)
     json (1.7.7)
-    mime-types (1.23)
+    mime-types (2.0)
     mixlib-authentication (1.3.0)
       mixlib-log
     mixlib-cli (1.3.0)
-    mixlib-config (1.1.2)
+    mixlib-config (2.0.0)
     mixlib-log (1.6.0)
-    mixlib-shellout (1.1.0)
+    mixlib-shellout (1.2.0)
     multi_json (1.8.2)
     net-ssh (2.7.0)
     net-ssh-gateway (1.2.0)
@@ -53,14 +53,14 @@ GEM
     net-ssh-multi (1.1)
       net-ssh (>= 2.1.4)
       net-ssh-gateway (>= 0.99.0)
-    nokogiri (1.5.9)
-    ohai (6.16.0)
+    nokogiri (1.5.10)
+    ohai (6.20.0)
       ipaddress
       mixlib-cli
       mixlib-config
       mixlib-log
       mixlib-shellout
-      systemu
+      systemu (~> 2.5.2)
       yajl-ruby
     rest-client (1.6.7)
       mime-types (>= 1.16)

data/README.md

@@ -72,7 +72,7 @@ $ stemcell --help
 ### Watching install:
 
 ```bash
-$ ssh ubuntu@$IP 'tail -f /var/log/init*'
+$ stemcell $your_chef_role --tail
 ```
 
 ### Terminating:

data/lib/stemcell/launcher.rb

@@ -30,6 +30,8 @@ module Stemcell
     ]
 
     LAUNCH_PARAMETERS = [
+      'chef_package_source',
+      'chef_version',
       'chef_role',
       'chef_environment',
       'chef_data_bag_secret',

data/lib/stemcell/metadata_source.rb

@@ -20,6 +20,8 @@ module Stemcell
       'count'            => 1,
       'instance_hostname' => '',
       'instance_domain_name' => '',
+      'chef_package_source' => 'http://www.opscode.com/chef/download?p=${platform}&pv=${platform_version}&m=${arch}&v=${chef_version}&prerelease=false',
+      'chef_version'      => '11.4.0',
     }
 
     def initialize(chef_root, config_filename=DEFAULT_CONFIG_FILENAME)

data/lib/stemcell/option_parser.rb

@@ -124,6 +124,18 @@ module Stemcell
         :type => String,
         :env  => 'CHEF_ROLE'
       },
+      {
+        :name  => 'chef_version',
+        :desc  => "the chef version we will bootstrap on the box (defaults to 11.4.0)",
+        :type  => String,
+        :env   => 'CHEF_VERSION'
+      },
+      {
+        :name  => 'chef_package_source',
+        :desc  => "source of chef packages (defaults to https://opscode-omnibus-packages.s3.amazonaws.com)",
+        :type  => String,
+        :env   => 'CHEF_PACKAGE_SOURCE'
+      },
       {
         :name  => 'chef_environment',
         :desc  => "chef environment in which this instance will run",

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

@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 #
 # This script will bootstrap and run chef
 #
@@ -57,8 +57,6 @@ echo $$ > ${PIDFILE}
 ## settings
 ##
 
-
-chef_version=11.4.0
 chef_dir=/etc/chef
 converge=/usr/local/bin/first_converge
 role=<%= opts['chef_role'] %>
@@ -112,14 +110,21 @@ set_hostname() {
 }
 
 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 $chef_version  1>&2
-  else
-    echo chef is already installed
-  fi
-}
+  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
+}
 
 update_repo() {
   echo -e "$git_key" > $keyfile

data/lib/stemcell/version.rb

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

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
+  prerelease: 
 platform: ruby
 authors:
 - Martin Rhoads
@@ -11,11 +12,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,6 +25,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,6 +33,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -37,6 +41,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -44,6 +49,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -51,6 +57,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -58,6 +65,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -65,6 +73,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -72,6 +81,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-creds
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -79,6 +89,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,6 +97,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -93,6 +105,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -100,6 +113,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -107,6 +121,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -172,26 +187,27 @@ files:
 - stemcell.gemspec
 homepage: https://github.com/airbnb/stemcell
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: no summary
 test_files:
 - spec/fixtures/chef_repo/roles-expected-metadata/unit-inherit-both.json

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWQxNmQ0NDdkNGMzZmRlMzVhOTMzNzJjODFlMDIyZTFkZjUyY2RiNA==
-  data.tar.gz: !binary |-
-    Y2RmNDdjNDZjNzIxNDIyNWE1MWNlMDZmZWM3ZWYxZjA2NzVjYWI0Nw==
-SHA512:
-  metadata.gz: !binary |-
-    NmRjOGQwOGVhMjFiZDZiNDVhZWQ3OGE2YTczOTU5MjhhOWNmZTdkYTIzYzYw
-    OGJmZGExMzM2YmRhMWQ0YTVjZTAzYjJmOTA2N2U2YTEyMGE1OTBmNGM1ODUz
-    YjU4N2EyMzFjNmE4ZDNjYTMwYTg1NGQ5MWNiOTRlNzUwZGQ0MTA=
-  data.tar.gz: !binary |-
-    OGY3NzRhYjY0ZTc1OGI2N2RmN2FlZWEwMGUxYmY1NjU0YWZmMjc0N2YyYWRi
-    ZjZmZTc1NGQ2OTRkYWNmMjUxM2JiOWRmZGRkNzg2ZGNlN2JkOTg5MjAyYzA4
-    MDI5YzQ4NzgxYmEzNmJlNjAzN2ZmNTExMTM1N2E5ZTU5NmQ3NDc=