stemcell 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0a73c0c28344f526396892ffde6de0054696d7f
-  data.tar.gz: 3286ce5584f761e5e643f9fe02bd575f9199e651
+  metadata.gz: 0311d6f13f75e1e7e52496b9491eb5768c13eb35
+  data.tar.gz: 67d5f0c43c6fbc5a81139ff8773a82027bd4fd99
 SHA512:
-  metadata.gz: 00ddd6ab1066baf755627d945f0fc033457f9256f891176a5af5b1b0d259fc93885d08a1d5b12cce4cbe42733be0b8af36ae6003fab521d7535cd00dd9da57e8
-  data.tar.gz: 4e09e64bba35df73ec82622889863d3456b162a6d9405954f02bb0087709bbf9a0036d052d543823871ed712d0c6171222a2bddbd7ab9e94eb9bdf7f351a036b
+  metadata.gz: 1d0e45ae07c7c9995d1c11198b0c6ba9991bc1e71e38fcdc6abf5e460ba91abcb52c45b27142c31b3a282738a86b8e53a3522be13f89e71c4b8f22229b2c8cbf
+  data.tar.gz: 27fc12f639c4b446edd1439e28d82d3dd078c807bbb2206f21b49fd73af1809d4543b86f6d3477ceaa797d4c93b0ce68d02d7038416a9b462e022bd8a3ffab10

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.12.1
+- Add support for Amazon Linux to the default bootstrap script
+- Allow setting backing_store options per region
+- Display private ip for launched instances
+
 # 0.12.0
 - Require Nokogiri ~> 1.8.2 due to vulnerability CVE-2017-15412
 - Require ruby version >= 2.1 for Nokogiri compatibility

data/lib/stemcell/launcher.rb

@@ -258,7 +258,8 @@ module Stemcell
       puts "\nhere is the info for what's launched:"
       instances.each do |instance|
         puts "\tinstance_id: #{instance.instance_id}"
-        puts "\tpublic ip:   #{instance.public_ip_address}"
+        puts "\tpublic ip:   #{instance.public_ip_address || 'none'}"
+        puts "\tprivate ip:  #{instance.private_ip_address || 'none'}"
         puts
       end
       puts "install logs will be in /var/log/init and /var/log/init.err"

data/lib/stemcell/metadata_source/configuration.rb

@@ -21,10 +21,10 @@ module Stemcell
         validate_configutation
       end
 
-      def options_for_backing_store(backing_store)
+      def options_for_backing_store(backing_store, region)
         options = backing_store_options[backing_store]
         raise UnknownBackingStoreError.new(backing_store) if options.nil?
-        options
+        options.fetch(region, options)
       end
 
       def random_az_for_region(region)

data/lib/stemcell/metadata_source.rb

@@ -84,9 +84,14 @@ module Stemcell
       backing_store ||= config.default_options['backing_store']
       backing_store ||= DEFAULT_BACKING_STORE
 
+      backing_store_region   = override_options['region']
+      backing_store_region ||= role_options.to_hash['region'] if role_options
+      backing_store_region ||= config.default_options['region']
+      backing_store_region ||= DEFAULT_OPTIONS['region']
+
       # Step 3: Retrieve the backing store options from the defaults.
 
-      backing_store_options = config.options_for_backing_store(backing_store)
+      backing_store_options = config.options_for_backing_store(backing_store, backing_store_region)
       backing_store_options['backing_store'] = backing_store
 
       # Step 4: Merge the options together in priority order.

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

@@ -54,16 +54,33 @@ encrypted_data_bag_secret_path='<%= opts['chef_data_bag_secret_path'].to_s %>'
 ##
 
 update() {
-  echo updating apt repo
-  apt-get update 1>&2
+  echo updating repository metadata
+
+  case $OS_PACKAGE_MANAGER in
+    apt)
+      apt-get update 1>&2
+      ;;
+    yum)
+      # yum install will check if metadata needs to be updated
+      # so it's just for consistency with apt-based distros
+      yum check-update 1>&2 || true
+      ;;
+  esac
 }
 
 install() {
-  if ! (dpkg -l | awk '{print $2}' | grep -q ^$1$ ) ; then
-    echo installing $1...
-    export DEBIAN_FRONTEND=noninteractive
-    apt-get install -y $1 1>&2
-  fi
+  case $OS_PACKAGE_MANAGER in
+    apt)
+      if ! (dpkg -l | awk '{print $2}' | grep -q ^$1$ ) ; then
+        echo installing $1...
+        export DEBIAN_FRONTEND=noninteractive
+        apt-get install -y $1 1>&2
+      fi
+      ;;
+    yum)
+      rpm -q $1 2>&1 >/dev/null || yum install -y $1
+      ;;
+  esac
 }
 
 set_hostname() {
@@ -86,22 +103,34 @@ set_hostname() {
   echo "$local_ip $fqdn $hostname" >> /etc/hosts
 }
 
+download_chef_package() {
+  echo "Downloading chef from $1"
+  wget "$1" -O "$2" --progress=dot:mega --tries=15 --retry-connrefused --timeout=5 --wait=10 --random-wait --continue --no-dns-cache
+}
+
 install_chef() {
+  package_local="/tmp/chef_${chef_version}.${OS_PACKAGE_EXT}"
+  package_url="$(render_chef_url)"
+
   # 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"
-    package_url="<%= opts['chef_package_source'] %>"
-    echo "Downloading chef from $package_url"
-    wget $package_url -O $package_local --progress=dot:mega
-    echo "Installing chef $chef_version"
-    dpkg -i $package_local
-    rm $package_local
+    case $OS_PACKAGE_MANAGER in
+      apt)
+        download_chef_package "$package_url" "$package_local"
+        echo "Installing chef $chef_version"
+        dpkg -i $package_local
+        ;;
+      yum)
+        download_chef_package "$package_url" "$package_local"
+        echo "Installing chef $chef_version"
+        rpm -ivh "$package_local"
+        ;;
+    esac
   else
     echo chef is already installed
   fi
+
+  rm -f $package_local
 }
 
 create_ohai_hint() {
@@ -154,7 +183,6 @@ cookbook_path ["#{repo_dir}/site-cookbooks", "#{repo_dir}/cookbooks"]
 role_path "#{repo_dir}/roles"
 data_bag_path "#{repo_dir}/data_bags"
 ohai.plugin_path << "#{repo_dir}/ohai_plugins"
-
 ssl_verify_mode :verify_peer
 log_level :info
 log_location STDOUT
@@ -199,7 +227,7 @@ git reset --hard origin/\${branch}
 git clean -fdx
 
 json="{\"role\": \"\${role}\", \"env\": \"\${env}\", \"branch\": \"\${branch}\"}"
-json_file=\`tempfile\`
+json_file=\`mktemp\`
 echo \$json > \$json_file
 trap "{ rm -f '\$json_file' ; }" EXIT
 
@@ -237,12 +265,55 @@ run_chef() {
   set -e
 }
 
+render_chef_url() {
+  base_url="<%= opts['chef_package_source'] %>"
+  echo $base_url | sed \
+    -e "s/%{platform}/$OS_PLATFORM/g" \
+    -e "s/%{platform_version}/$OS_PLATFORM_VERSION/g" \
+    -e "s/%{chef_version}/$chef_version/g" \
+    -e "s/%{package_manager}/$OS_PACKAGE_MANAGER/g" \
+    -e "s/%{package_arch}/$OS_PACKAGE_ARCH/g" \
+    -e "s/%{package_ext}/$OS_PACKAGE_EXT/g"
+}
+
+check_os_version() {
+  NAME=unsupported
+
+  if [ -f /etc/os-release ]; then
+    . /etc/os-release
+  fi
+
+  case "$NAME" in
+    "Ubuntu")
+      OS_VERSION="$NAME $VERSION_ID"
+      OS_PLATFORM=ubuntu
+      OS_PLATFORM_VERSION=$VERSION_ID
+      OS_PACKAGE_MANAGER=apt
+      OS_PACKAGE_ARCH=$(dpkg --print-architecture)
+      OS_PACKAGE_EXT=deb
+      ;;
+    "Amazon Linux")
+      OS_VERSION="$NAME $VERSION_ID"
+      OS_PLATFORM=amazon
+      OS_PLATFORM_VERSION=$VERSION_ID
+      OS_PACKAGE_MANAGER=yum
+      OS_PACKAGE_ARCH=$(uname -m)
+      OS_PACKAGE_EXT=rpm
+      ;;
+    *)
+      echo "Unsupported operating system"
+      exit 1
+      ;;
+  esac
+}
 
 ##
 ## main
 ##
 
-echo "starting chef bootstrapping..."
+check_os_version
+
+echo "starting chef bootstrapping on ${OS_VERSION}..."
 update
 install curl
 install git

data/lib/stemcell/version.rb

@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

data/spec/fixtures/chef_repo/stemcell-azs-missing.json

@@ -4,7 +4,9 @@
   },
   "backing_store": {
     "instance_store": {
-      "image_id": "ami-d9d6a6b0"
+      "us-east-1": {
+        "image_id": "ami-d9d6a6b0"
+      }
     }
   }
 }

data/spec/fixtures/chef_repo/stemcell-backing-store-legacy.json

@@ -0,0 +1,13 @@
+{
+  "defaults": {
+    "instance_type": "m1.small"
+  },
+  "backing_store": {
+    "instance_store": {
+      "image_id": "ami-d9d6a6b0"
+    }
+  },
+  "availability_zones": {
+    "us-east-1": ["us-east-1a"]
+  }
+}

data/spec/fixtures/chef_repo/stemcell-cookbook-attribute.json

@@ -5,7 +5,9 @@
   },
   "backing_store": {
     "instance_store": {
-      "image_id": "ami-d9d6a6b0"
+      "us-east-1": {
+        "image_id": "ami-d9d6a6b0"
+      }
     }
   },
   "availability_zones": {

data/spec/fixtures/chef_repo/stemcell-defaults-missing.json

@@ -1,7 +1,9 @@
 {
   "backing_store": {
     "instance_store": {
-      "baz": "woo"
+      "us-east-1": {
+        "baz": "woo"
+      }
     }
   },
   "availability_zones": {

data/spec/fixtures/chef_repo/stemcell-options-parser.json

@@ -16,10 +16,14 @@
 
   "backing_store": {
     "hvm1": {
-      "image_id": "ami-1"
+      "us-east-1": {
+        "image_id": "ami-1"
+      }
     },
     "pv1": {
-      "image_id": "ami-2"
+      "us-east-1": {
+        "image_id": "ami-2"
+      }
     }
   },
 

data/spec/fixtures/chef_repo/stemcell.json

@@ -4,7 +4,9 @@
   },
   "backing_store": {
     "instance_store": {
-      "image_id": "ami-d9d6a6b0"
+      "us-east-1": {
+        "image_id": "ami-d9d6a6b0"
+      }
     }
   },
   "availability_zones": {

data/spec/lib/stemcell/metadata_source/configuration_spec.rb

@@ -32,7 +32,9 @@ describe Stemcell::MetadataSource::Configuration do
       it "sets backing_store_options" do
         expect(config.backing_store_options).to eql({
           'instance_store' => {
-            'image_id' => 'ami-d9d6a6b0'
+            'us-east-1' => {
+              'image_id' => 'ami-d9d6a6b0'
+            }
           }
         })
       end
@@ -86,10 +88,11 @@ describe Stemcell::MetadataSource::Configuration do
 
   describe '#options_for_backing_store' do
     let(:backing_store) { 'instance_store' }
+    let(:region) { 'us-east-1' }
 
     context "when the backing store definition exists" do
       it "returns the options" do
-        expect(config.options_for_backing_store(backing_store)).to eql({
+        expect(config.options_for_backing_store(backing_store, region)).to eql({
           'image_id' => 'ami-d9d6a6b0'
         })
       end
@@ -97,13 +100,23 @@ describe Stemcell::MetadataSource::Configuration do
 
     context "when the backing store isn't defined" do
       let(:backing_store) { 'nyanstore' }
+      let(:region) { 'us-east-1' }
       it "raises" do
-        expect { config.options_for_backing_store(backing_store) }.to raise_error(
+        expect { config.options_for_backing_store(backing_store, region) }.to raise_error(
           Stemcell::UnknownBackingStoreError
         )
       end
     end
 
+    context "when the legacy backing store definition exists" do
+      let(:config_filename) { 'stemcell-backing-store-legacy.json' }
+      it "returns the options" do
+        expect(config.options_for_backing_store(backing_store, region)).to eql({
+          'image_id' => 'ami-d9d6a6b0'
+        })
+      end
+    end
+
   end
 
   describe '#random_az_in_region' do

data/spec/lib/stemcell/metadata_source_spec.rb

@@ -161,7 +161,8 @@ describe Stemcell::MetadataSource do
         it "calls the config object to retrieve the backing store options" do
           backing_options.merge!('image_id' => 'ami-nyancat')
           override_options.merge!('backing_store' => 'ebs')
-          expect(config).to receive(:options_for_backing_store).with('ebs') { backing_options }
+          override_options.merge!('region' => 'us-east-1')
+          expect(config).to receive(:options_for_backing_store).with('ebs', 'us-east-1') { backing_options }
           expect(expansion['image_id']).to eql 'ami-nyancat'
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Martin Rhoads
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -207,6 +207,7 @@ files:
 - spec/fixtures/chef_repo/roles/unit-simple-override.rb
 - spec/fixtures/chef_repo/stemcell-azs-missing.json
 - spec/fixtures/chef_repo/stemcell-backing-store-empty.json
+- spec/fixtures/chef_repo/stemcell-backing-store-legacy.json
 - spec/fixtures/chef_repo/stemcell-backing-store-missing.json
 - spec/fixtures/chef_repo/stemcell-cookbook-attribute.json
 - spec/fixtures/chef_repo/stemcell-defaults-missing.json
@@ -241,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: no summary
@@ -268,6 +269,7 @@ test_files:
 - spec/fixtures/chef_repo/roles/unit-simple-override.rb
 - spec/fixtures/chef_repo/stemcell-azs-missing.json
 - spec/fixtures/chef_repo/stemcell-backing-store-empty.json
+- spec/fixtures/chef_repo/stemcell-backing-store-legacy.json
 - spec/fixtures/chef_repo/stemcell-backing-store-missing.json
 - spec/fixtures/chef_repo/stemcell-cookbook-attribute.json
 - spec/fixtures/chef_repo/stemcell-defaults-missing.json