bosh_aws_cpi 0.7.0 → 1.5.0.pre.1113

data/README.md

@@ -9,22 +9,25 @@ These options are passed to the AWS CPI when it is instantiated.
 
 ### AWS options
 
-* `access_key_id` (required)  
+* `access_key_id` (required)
   AWS IAM user access key
-* `secret_access_key` (required)  
+* `secret_access_key` (required)
   AWS IAM secret access key
-* `default_key_name` (required)  
+* `default_key_name` (required)
   default AWS ssh key name to assign to created virtual machines
-* `default_security_group` (required)  
-  default AWS security group to assign to created virtual machines
-* `ec2_private_key` (required)  
+* `default_security_groups` (required)
+  list of AWS security group to assign to created virtual machines
+* `ec2_private_key` (required)
   local path to the ssh private key, must match `default_key_name`
-* `region` (optional)  
-  EC2 region, defaults to `us-east-1`
-* `ec2_endpoint` (optional)  
+* `region` (required)
+  EC2 region
+* `ec2_endpoint` (optional)
   URL of the EC2 endpoint to connect to, defaults to the endpoint corresponding to the selected region,
-  or `DEFAULT_EC2_ENDPOINT` if no region has been selected
-* `max_retries` (optional)  
+  or `default_ec2_endpoint` if no region has been selected
+* `elb_endpoint` (optional)
+  URL of the ELB endpoint to connect to, default to the endpoint corresponding to the selected region,
+  or `default_elb_endpoint` if no region has been selected
+* `max_retries` (optional)
   maximum number of time to retry an AWS API call, defaults to `DEFAULT_MAX_RETRIES`
 
 ### Registry options
@@ -32,11 +35,11 @@ These options are passed to the AWS CPI when it is instantiated.
 The registry options are passed to the AWS CPI by the BOSH director based on the settings in `director.yml`, but can be
 overridden if needed.
 
-* `endpoint` (required)  
+* `endpoint` (required)
   registry URL
-* `user` (required)  
+* `user` (required)
   registry user
-* `password` (required)  
+* `password` (required)
   registry password
 
 ### Agent options
@@ -48,16 +51,16 @@ overridden if needed.
 
 These options are specified under `cloud_options` in the `resource_pools` section of a BOSH deployment manifest.
 
-* `availability_zone` (optional)  
+* `availability_zone` (optional)
   the EC2 availability zone the VMs should be created in
-* `instance_type` (required)  
+* `instance_type` (required)
   which [type of instance](http://aws.amazon.com/ec2/instance-types/) the VMs should belong to
 
 ### Network options
 
 These options are specified under `cloud_options` in the `networks` section of a BOSH deployment manifest.
 
-* `type` (required)  
+* `type` (required)
   can be either `dynamic` for a DHCP assigned IP by AWS, or `vip` to use an Elastic IP (which needs to be already
   allocated)
 
@@ -88,8 +91,8 @@ This is a sample of how AWS specific properties are used in a BOSH deployment ma
         network: default
         size: 3
         stemcell:
-          name: bosh-stemcell
-          version: 0.6.7
+          name: bosh-aws-xen-ubuntu
+          version: latest
         cloud_properties:
           instance_type: m1.small
 

data/bin/bosh_aws_console

@@ -6,15 +6,6 @@
 # irb(main):001:0> cpi.create_vm("test", "ami-809a48e9",
 #                  {"instance_type" => "m1.small"}, {}, [], {"foo" =>"bar"})
 
-gemfile = File.expand_path("../../Gemfile", __FILE__)
-
-if File.exists?(gemfile)
-  ENV["BUNDLE_GEMFILE"] = gemfile
-  require "rubygems"
-  require "bundler/setup"
-end
-
-$:.unshift(File.expand_path("../../lib", __FILE__))
 require "bosh_aws_cpi"
 require "irb"
 require "irb/completion"
@@ -34,7 +25,7 @@ unless config_file
   exit(1)
 end
 
-@config = YAML.load_file(config_file)
+@config = Psych.load_file(config_file)
 
 module ConsoleHelpers
   def cpi
@@ -67,6 +58,3 @@ puts "=> Welcome to BOSH AWS CPI console"
 puts "You can use 'cpi' to access CPI methods"
 
 IRB.start
-
-
-

data/lib/bosh_aws_cpi.rb

@@ -1,3 +1,3 @@
 # Copyright (c) 2009-2012 VMware, Inc.
 
-require "cloud/aws"
+require "cloud/aws"

data/lib/cloud/aws/aki_picker.rb

@@ -1,9 +1,9 @@
 module Bosh::AwsCloud
   class AKIPicker
 
-    # @param [AWS::Core::ServiceInterface] ec2
-    def initialize(ec2)
-      @ec2 = ec2
+    # @param [AWS::Core::ServiceInterface] region
+    def initialize(region)
+      @region = region
     end
 
     # finds the correct aki for the current region
@@ -22,15 +22,15 @@ module Bosh::AwsCloud
 
     def fetch_akis(architecture)
       filter = aki_filter(architecture)
-      @ec2.client.describe_images(:filters => filter).images_set
+      @region.client.describe_images(filters: filter).images_set
     end
 
     # @return [Hash] search filter
     def aki_filter(architecture)
       [
-          {:name => "architecture", :values => [architecture]},
-          {:name => "image-type", :values => %w[kernel]},
-          {:name => "owner-alias", :values => %w[amazon]}
+          {name: "architecture", values: [architecture]},
+          {name: "image-type", values: %w[kernel]},
+          {name: "owner-alias", values: %w[amazon]}
       ]
     end
 

data/lib/cloud/aws/availability_zone_selector.rb

@@ -0,0 +1,40 @@
+module Bosh::AwsCloud
+  class AvailabilityZoneSelector
+    attr_accessor :region
+
+    def initialize(region, default_name)
+      @region = region
+      @default = default_name
+    end
+
+    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)
+
+      zone_names.first || @default
+    end
+
+    def select_availability_zone(instance_id)
+      if instance_id
+        region.instances[instance_id].availability_zone
+      elsif @default
+        @default
+      else
+        random_availability_zone
+      end
+    end
+
+    private
+
+    def random_availability_zone
+      zones = []
+      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