bosh_aws_cpi 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4715d56bc4b85eac9fd0189d39b4ded22f321a93
-  data.tar.gz: b398c1ed46eaf078f592326429962273b4134b7d
+  metadata.gz: 8f1678fa3712efeb30ac293ada0fdb2183a3c043
+  data.tar.gz: eb18fe472d0f6f7fe0e0bedca3c64de37c3b2a55
 SHA512:
-  metadata.gz: 7b5bea5f2a608cbcf193be6dfd842de0533d7484c932065d3af3b9b58baaa2a0fedee2a0a35ae0f09c926369fceac7e65226c5286534f62038a26933e25c4548
-  data.tar.gz: 9a063456dc99cf0170ebde8f2e7b4ffdc7064df20588f54adbf9a78132b05213a365140a241ac21447f1864627a6f529020bce3b081ec6d81ee3b63d27479415
+  metadata.gz: e0b8e1fbe36086aeaa4ac308ab30b5e2069c453b7722e5e2db1a0786e9fe4e608dc2cace7e4bc5ae82959f3fc245391954a54a356c5d42cc9237ccfc06fef368
+  data.tar.gz: 34e7d8ce2a7a05c13f9d6093d2391674358fcac953a268fa00f903575dad2d198b8cabb77e2f460a75e2ff8bc5dd71c87bca2f4134f6fb91230860f7edf983e7

data/lib/cloud/aws/availability_zone_selector.rb

@@ -9,7 +9,12 @@ module Bosh::AwsCloud
 
     def common_availability_zone(volume_az_names, resource_pool_az_name, vpc_subnet_az_name)
       zone_names = (volume_az_names + [resource_pool_az_name, vpc_subnet_az_name]).compact.uniq
-      ensure_same_availability_zone(zone_names)
+      if zone_names.size > 1
+        raise Bosh::Clouds::CloudError,
+          "can't use multiple availability zones: Volume in #{volume_az_names.join(', ')}, " +
+              "Resource Pool in #{resource_pool_az_name}, " +
+              "Subnet in #{vpc_subnet_az_name}"
+      end
 
       zone_names.first || @default
     end
@@ -31,10 +36,5 @@ module Bosh::AwsCloud
       region.availability_zones.each { |zone| zones << zone.name }
       zones[Random.rand(zones.size)]
     end
-
-    def ensure_same_availability_zone(zone_names)
-      raise Bosh::Clouds::CloudError,
-            "can't use multiple availability zones: #{zone_names.join(', ')}" if zone_names.size > 1
-    end
   end
-end
+end

data/lib/cloud/aws/cloud.rb

@@ -57,7 +57,13 @@ module Bosh::AwsCloud
       initialize_aws
       initialize_registry
 
-      elb = AWS::ELB.new(@aws_params)
+      aws_elb_params = {
+        access_key_id:     aws_properties['access_key_id'],
+        secret_access_key: aws_properties['secret_access_key'],
+        region:            aws_properties['region']
+      }
+
+      elb = AWS::ELB.new(aws_elb_params)
 
       @instance_manager = InstanceManager.new(region, registry, elb, az_selector, @logger)
 

data/lib/cloud/aws/resource_wait.rb

@@ -160,10 +160,6 @@ module Bosh::AwsCloud
       Bosh::Clouds::Config.logger
     end
 
-    def self.task_checkpoint
-      Bosh::Clouds::Config.task_checkpoint
-    end
-
     def initialize
       @started_at = Time.now
     end
@@ -187,7 +183,6 @@ module Bosh::AwsCloud
 
       state = nil
       Bosh::Retryable.new(tries: tries, sleep: sleep_cb, on: errors, ensure: ensure_cb).retryer do
-        Bosh::AwsCloud::ResourceWait.task_checkpoint
 
         state = resource.method(state_method).call
         if state == :error || state == :failed

data/scripts/stemcell-copy.sh

@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# This script runs as root through sudo without the need for a password,
+# so it needs to make sure it can't be abused.
+#
+
+# make sure we have a secure PATH
+PATH=/bin:/usr/bin
+export PATH
+if [ $# -ne 2 ]; then
+  echo "usage: $0 <image-file> <block device>"
+  exit 1
+fi
+
+IMAGE="$1"
+OUTPUT="$2"
+
+# workaround for issue on 12.04 LTS, use LANG=C
+echo ${IMAGE} | LANG=C egrep '^/[A-za-z0-9_/-]+/image$' > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+  echo "ERROR: illegal image file: ${IMAGE}"
+  exit 1
+fi
+
+echo ${OUTPUT} | egrep '^/dev/[svx]+d[a-z0-9]+$' > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+  echo "ERROR: illegal device: ${OUTPUT}"
+  exit 1
+fi
+
+if [ ! -b ${OUTPUT} ]; then
+  echo "ERROR: not a device: ${OUTPUT}"
+  exit 1
+fi
+
+# copy image to block device with 1 MB block size
+tar -xzf ${IMAGE} -O root.img | dd bs=1M of=${OUTPUT}

data/scripts/vendor_gems

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+bundle package --all --all-platforms

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -125,6 +125,8 @@ files:
 - lib/cloud/aws/stemcell_finder.rb
 - lib/cloud/aws/tag_manager.rb
 - lib/cloud/aws/vip_network.rb
+- scripts/stemcell-copy.sh
+- scripts/vendor_gems
 homepage: https://github.com/cloudfoundry/bosh
 licenses:
 - Apache 2.0