bosh_aws_cpi 1.3069.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a0a462c224cf436cf5fdb2df4ce3b1f9d2f5113
-  data.tar.gz: 24574447fc0a4178850435380939f308a3620026
+  metadata.gz: 4715d56bc4b85eac9fd0189d39b4ded22f321a93
+  data.tar.gz: b398c1ed46eaf078f592326429962273b4134b7d
 SHA512:
-  metadata.gz: 541e83ed525883434cd25b3588a02588084763ac70c31e3aff1b2368caedbd7139913e67d3d9815eb9c76ea5d63a9eda3b7793cd4a296292045f4fd4fa9282e5
-  data.tar.gz: faede81fc31ccc0a9f0d2dff5811ef9f68d18d7699e8669663a74a22337e9ac4932bc1407b68b5b23f65426d7b29d59ce934c453ea4c975631df00f264556b47
+  metadata.gz: 7b5bea5f2a608cbcf193be6dfd842de0533d7484c932065d3af3b9b58baaa2a0fedee2a0a35ae0f09c926369fceac7e65226c5286534f62038a26933e25c4548
+  data.tar.gz: 9a063456dc99cf0170ebde8f2e7b4ffdc7064df20588f54adbf9a78132b05213a365140a241ac21447f1864627a6f529020bce3b081ec6d81ee3b63d27479415

data/bin/aws_cpi

@@ -1,9 +1,12 @@
 #!/usr/bin/env ruby
 
+require 'yaml'
 require 'ostruct'
-require 'bosh_aws_cpi'
 require 'bosh/cpi'
-require 'bosh/cpi/cli'
+require 'bundler'
+
+Bundler.setup(:default)
+require 'cloud/aws'
 
 cpi_config = YAML.load_file(ARGV.shift)
 cloud_config = OpenStruct.new(:logger => Logger.new(STDERR))

data/lib/cloud/aws.rb

@@ -21,7 +21,6 @@ require "bosh/registry/client"
 require "cloud"
 require "cloud/aws/helpers"
 require "cloud/aws/cloud"
-require "cloud/aws/version"
 
 require "cloud/aws/aki_picker"
 require "cloud/aws/network_configurator"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 1.3069.0
+  version: 2.0.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -28,44 +28,44 @@ dependencies:
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3069.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3069.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3069.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3069.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3069.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3069.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -94,48 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: BOSH AWS CPI
 email: support@cloudfoundry.com
 executables:
@@ -166,9 +124,7 @@ files:
 - lib/cloud/aws/stemcell_creator.rb
 - lib/cloud/aws/stemcell_finder.rb
 - lib/cloud/aws/tag_manager.rb
-- lib/cloud/aws/version.rb
 - lib/cloud/aws/vip_network.rb
-- scripts/stemcell-copy.sh
 homepage: https://github.com/cloudfoundry/bosh
 licenses:
 - Apache 2.0

data/lib/cloud/aws/version.rb

@@ -1,5 +0,0 @@
-module Bosh
-  module AwsCloud
-    VERSION = '1.3069.0'
-  end
-end

data/scripts/stemcell-copy.sh

@@ -1,37 +0,0 @@
-#!/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}