stemcell 0.4.4 → 0.5.0

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile.lock

@@ -0,0 +1,74 @@
+PATH
+  remote: .
+  specs:
+    stemcell (0.5.0)
+      aws-creds (~> 0.2.2)
+      aws-sdk (~> 1.9)
+      chef (~> 11.4.0)
+      colored (~> 1.2)
+      json (~> 1.7.7)
+      net-ssh (~> 2.6)
+      trollop (~> 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    aws-creds (0.2.2)
+      trollop (~> 2.0)
+    aws-sdk (1.21.0)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4, < 1.6.0)
+      uuidtools (~> 2.1)
+    chef (11.4.4)
+      erubis
+      highline (>= 1.6.9)
+      json (>= 1.4.4, <= 1.7.7)
+      mixlib-authentication (>= 1.3.0)
+      mixlib-cli (~> 1.3.0)
+      mixlib-config (>= 1.1.2)
+      mixlib-log (>= 1.3.0)
+      mixlib-shellout
+      net-ssh (~> 2.6)
+      net-ssh-multi (~> 1.1.0)
+      ohai (>= 0.6.0)
+      rest-client (>= 1.0.4, < 1.7.0)
+      yajl-ruby (~> 1.1)
+    colored (1.2)
+    erubis (2.7.0)
+    highline (1.6.19)
+    ipaddress (0.8.0)
+    json (1.7.7)
+    mime-types (1.23)
+    mixlib-authentication (1.3.0)
+      mixlib-log
+    mixlib-cli (1.3.0)
+    mixlib-config (1.1.2)
+    mixlib-log (1.6.0)
+    mixlib-shellout (1.1.0)
+    net-ssh (2.7.0)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    net-ssh-multi (1.1)
+      net-ssh (>= 2.1.4)
+      net-ssh-gateway (>= 0.99.0)
+    nokogiri (1.5.9)
+    ohai (6.16.0)
+      ipaddress
+      mixlib-cli
+      mixlib-config
+      mixlib-log
+      mixlib-shellout
+      systemu
+      yajl-ruby
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    systemu (2.5.2)
+    trollop (2.0)
+    uuidtools (2.1.4)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  stemcell!

data/examples/stemcellrc

@@ -13,6 +13,9 @@ export KEY_NAME=your_aws_ssh_key_name
 #   http://docs.opscode.com/chef/essentials_data_bags.html#secret-keys
 export CHEF_DATA_BAG_SECRET=/path/to/encrypted/data/bag/secret
 
+# Chef environment
+CHEF_ENVIRONMENT=default
+
 # This expects a standard opscode mono-repo, like the one
 #   modeled here: https://github.com/opscode/chef-repo
 export LOCAL_CHEF_ROOT=/path/to/your/local/chef/repository
@@ -21,9 +24,12 @@ export LOCAL_CHEF_ROOT=/path/to/your/local/chef/repository
 #   local chef root; we use a github enterprise server
 export GIT_ORIGIN=git@git.airbnb.com:airbnb/chef.git
 
+# The git branch to use by default
+export GIT_BRANCH=production
+
 # The git key is an SSH key which has pull permissions on
 #   the GIT_ORIGIN repo
 export GIT_KEY=/path/to/chef/deploy/key
 
-# Which security group should you launch
-export SECURITY_GROUP=default
+# Which security groups should you launch
+export SECURITY_GROUPS=default

data/lib/stemcell/launcher.rb

@@ -38,6 +38,8 @@ module Stemcell
       'git_origin',
       'key_name',
       'instance_type',
+      'instance_hostname',
+      'instance_domain_name',
       'image_id',
       'availability_zone',
       'count',
@@ -87,7 +89,7 @@ module Stemcell
       tags = {
         'Name' => "#{opts['chef_role']}-#{opts['chef_environment']}",
         'Group' => "#{opts['chef_role']}-#{opts['chef_environment']}",
-        'created_by' => ENV['USER'],
+        'created_by' => opts.fetch('user', ENV['USER']),
         'stemcell' => VERSION,
       }
       tags.merge!(opts['tags']) if opts['tags']
@@ -96,7 +98,6 @@ module Stemcell
       launch_options = {
         :image_id => opts['image_id'],
         :security_groups => opts['security_groups'],
-        :user_data => opts['user_data'],
         :instance_type => opts['instance_type'],
         :key_name => opts['key_name'],
         :count => opts['count'],
@@ -142,19 +143,22 @@ module Stemcell
 
       # generate user data script to bootstrap instance, include in launch
       # options UNLESS we have manually set the user-data (ie. for ec2admin)
-      launch_options[:user_data] ||= render_template(opts)
+      launch_options[:user_data] = opts.fetch('user_data', render_template(opts))
 
       # launch instances
       instances = do_launch(launch_options)
 
-      # wait for aws to report instance stats
-      wait(instances)
-
       # set tags on all instances launched
       set_tags(instances, tags)
+      @log.info "sent ec2 api requests successfully"
+
+      # wait for aws to report instance stats
+      if opts.fetch('wait', true)
+        wait(instances)
+        print_run_info(instances)
+        @log.info "launched instances successfully"
+      end
 
-      print_run_info(instances)
-      @log.info "launched instances successfully"
       return instances
     end
 

data/lib/stemcell/metadata_source.rb

@@ -9,7 +9,9 @@ module Stemcell
     DEFAULT_OPTIONS = {
       'chef_environment' => 'production',
       'git_branch'       => 'production',
-      'count'            => 1
+      'count'            => 1,
+      'instance_hostname' => '',
+      'instance_domain_name' => '',
     }
 
     # Search for instance metadata in the following role attributes, with

data/lib/stemcell/option_parser.rb

@@ -148,6 +148,18 @@ module Stemcell
         :type  => String,
         :env   => 'GIT_KEY'
       },
+      {
+        :name  => 'instance_hostname',
+        :desc  => "the hostname of new instances; defaults to the instance id if omitted",
+        :type  => String,
+        :env   => 'INSTANCE_HOSTNAME'
+      },
+      {
+        :name  => 'instance_domain_name',
+        :desc  => "the domain part of the FQDN of created instances (like airbnb.com)",
+        :type  => String,
+        :env   => 'INSTANCE_DOMAIN_NAME'
+      },
       {
         :name  => 'count',
         :desc  => "number of instances to launch",

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

@@ -65,8 +65,10 @@ role=<%= opts['chef_role'] %>
 environment=<%= opts['chef_environment'] %>
 origin=<%= opts['git_origin'] %>
 branch=<%= opts['git_branch'] %>
-git_key='<%= opts["git_key"] %>'
+git_key='<%= opts['git_key'] %>'
 data_bag_secret='<%= opts["chef_data_bag_secret"] %>'
+hostname='<%= opts['instance_hostname'] %>'
+domain_name='<%= opts['instance_domain_name'] %>'
 
 
 ##
@@ -89,11 +91,25 @@ install() {
 }
 
 
-get_instance_id() {
-  instance_id=`curl --retry 5 --retry-delay 5 169.254.169.254/latest/meta-data/instance-id` 1>&2
-  echo instance_id is $instance_id
-}
+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
+
+  if [ "z$hostname" == "z" ]; then
+    hostname=$instance_id
+  fi
+  if [ "z${domain_name}" == "z" ]; then
+    domain_name="localdomain"
+  fi
 
+  fqdn="${hostname}.${domain_name}"
+  echo "setting hostname to $hostname ($fqdn)"
+  echo $hostname > /etc/hostname
+  hostname -F /etc/hostname
+
+  # allow a proper `hostname -f` to return something
+  echo "$local_ip $fqdn $hostname" >> /etc/hosts
+}
 
 install_chef() {
   if ! which chef-solo > /dev/null ; then
@@ -125,7 +141,10 @@ update_repo() {
 
 
 configure_chef() {
-  echo "saving current branch ($branch), role ($role), and environment ($environment)"
+  echo "saving current origin ($origin), branch ($branch), role ($role), and environment ($environment)"
+  echo "$origin" > $originfile
+  chmod 644 $originfile
+
   echo "$branch" > $branchfile
   chmod 644 $branchfile
 
@@ -221,6 +240,7 @@ 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..."
@@ -228,7 +248,7 @@ mkdir -p ${chef_dir}
 update
 install curl
 install git
-get_instance_id
+set_hostname
 install_chef
 update_repo
 configure_chef

data/lib/stemcell/version.rb

@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -138,6 +138,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile