provisionator 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9456d0baf6f999eb03d582b97b2d04dc55e16ed2
-  data.tar.gz: 0700eef879706f2776131259a0326d413b2e99db
+  metadata.gz: 82963adf7311538addb67d420d72022bf7167892
+  data.tar.gz: d12766be8959ff559f47e09a72dfa2d22531a560
 SHA512:
-  metadata.gz: 89005c7ebb14b690483f078beddd284d4d5bf273b49822b566f9c52fbfb5d64679a38aa03870fb7e47e2b15fe2ecc0f367b4285ea848c6baaab91c1a462b1f92
-  data.tar.gz: f35fcc20a491668089344aa0603aeca78690965a39f25333f65db6faa51b873323f0cc10025f9c73a64d6cfdd03592a73acaa66a9974681abb9b2ff87e3ebcd2
+  metadata.gz: 1a4bb193ebc56d38ae0e858e747077c38173c295b12c68aec90d6e041c9d3b236f128237c4073567c959b8278173aff5639e2a0415bcfd8152aa2e7d6b9e7205
+  data.tar.gz: 56b7312f688f3e74e4a1498d973dcbce2927be42dec329230d9f53a1a1f431bc4c3488ca712b42c83751e947523f9b86ee4740a687f00fd650d53b12749b834e

data/lib/provisionator/ec2_launcher.rb

@@ -10,17 +10,18 @@ module Provisionator
     end
 
     def initialize options={}
-      @options = options
+      %w{ AWS_REGION AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY}.each do |env_var|
+        raise "ENV['#{env_var}'] is required to be set"            unless ENV[env_var]
+      end
 
+      @options = options
       @options[:instance_type] ||= ENV['P_INSTANCE_TYPE'] || 'm1.small'
       @options[:no_release] ||= ENV['P_NO_RELEASE']
-      @options[:ec2_region] ||= ENV['P_EC2_REGION'] || 'us-east-1'
-      @options[:ec2_endpoint] ||= ENV['P_EC2_ENDPOINT'] || "ec2.#{@options[:ec2_region]}.amazonaws.com"
-      @options[:ami_id] ||= ENV['P_AMI_ID']
+      @options[:ami_id] ||= ENV['P_AMI_ID'] || ami_id
       @options[:ebs_volumes] ||= []
       @options[:key_name] ||= ENV['P_KEY_NAME']
       @options[:security_groups] ||= ENV['P_SECURITY_GROUPS'].try(:split, ',')
-      @options[:availability_zones] ||= ENV['P_AVAILABILITY_ZONES'].try(:split, ',') || ec2.regions[@options[:ec2_region]].availability_zones.map(&:name)
+      @options[:availability_zones] ||= ENV['P_AVAILABILITY_ZONES'].try(:split, ',') || ec2.availability_zones.map(&:name)
       @options[:instance_count] ||= ENV['P_INSTANCE_COUNT'].try(:to_i) || 1
       @options[:load_balancer_name] ||= ENV['P_LOAD_BALANCER_NAME']
     
@@ -44,10 +45,21 @@ module Provisionator
 
     private
 
+    def ami_id
+      case ENV['AWS_REGION']
+      when 'us-east-1'
+        'ami-bbf799d2'
+      when 'ap-southeast-2'
+        'ami-6bcf5c51'
+      else
+        raise "no ami-id defined for region '#{ENV['AWS_REGION']}'"
+      end
+    end
+
     def assign_elastic_ip instance
       return unless @options[:elastic_ip]
       puts "Assigning #{@options[:elastic_ip]} to #{instance.id}"
-      ec2_client.associate_address instance_id: instance.id, public_ip: @options[:elastic_ip]
+      ec2.client.associate_address instance_id: instance.id, public_ip: @options[:elastic_ip]
     end
 
     def register_with_load_balancer instances
@@ -86,16 +98,12 @@ module Provisionator
       end
     end
 
-    def ec2_client
-      @ec2_client ||= AWS::EC2::Client.new(ec2_endpoint: "ec2.#{@options[:ec2_region]}.amazonaws.com")
-    end
-
     def ec2
-      @ec2 ||= AWS::EC2.new(ec2_endpoint: "ec2.#{@options[:ec2_region]}.amazonaws.com")
+      @ec2 ||= AWS::EC2.new
     end
 
     def elb
-      @elb ||= AWS::ELB::Client.new(ec2_endpoint: "elasticloadbalancing.#{@options[:ec2_region]}.amazonaws.com")
+      @elb ||= AWS::ELB::Client.new
     end
 
     def user_data attributes={}

data/lib/provisionator/version.rb

@@ -1,3 +1,3 @@
 module Provisionator
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: provisionator
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - cmaitchison