vagrant-aws 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.1.2 (March 22, 2013)
+
+* Choose the proper region when connecting to AWS. [GH-9]
+* Configurable SSH port. [GH-13]
+* Support other AWS-compatible API endpoints with `config.endpoint`
+  and `config.version`. [GH-6]
+* Disable strict host key checking on rsync so known hosts aren't an issue. [GH-7]
+
 # 0.1.1 (March 18, 2013)
 
 * Up fog dependency for Vagrant 1.1.1

data/lib/vagrant-aws/action/connect_aws.rb

@@ -19,16 +19,20 @@ module VagrantPlugins
 
           # Get the configs
           region_config     = env[:machine].provider_config.get_region_config(region)
-          access_key_id     = region_config.access_key_id
-          secret_access_key = region_config.secret_access_key
+
+          # Build the fog config
+          fog_config = {
+            :provider              => :aws,
+            :aws_access_key_id     => region_config.access_key_id,
+            :aws_secret_access_key => region_config.secret_access_key,
+            :region                => region
+          }
+
+          fog_config[:endpoint] = region_config.endpoint if region_config.endpoint
+          fog_config[:version]  = region_config.version if region_config.version
 
           @logger.info("Connecting to AWS...")
-          env[:aws_compute] = Fog::Compute.new({
-            :provider => :aws,
-            :aws_access_key_id => access_key_id,
-            :aws_secret_access_key => secret_access_key,
-            :region => region
-          })
+          env[:aws_compute] = Fog::Compute.new(fog_config)
 
           @app.call(env)
         end

data/lib/vagrant-aws/action/read_ssh_info.rb

@@ -36,7 +36,7 @@ module VagrantPlugins
           # Read the DNS info
           return {
             :host => server.dns_name,
-            :port => 22,
+            :port => config.ssh_port,
             :private_key_path => config.ssh_private_key_path,
             :username => config.ssh_username
           }

data/lib/vagrant-aws/action/run_instance.rb

@@ -28,6 +28,7 @@ module VagrantPlugins
           ami                = region_config.ami
           availability_zone  = region_config.availability_zone
           instance_type      = region_config.instance_type
+          ssh_port           = region_config.ssh_port
           keypair            = region_config.keypair_name
           private_ip_address = region_config.private_ip_address
           security_groups    = region_config.security_groups
@@ -50,6 +51,7 @@ module VagrantPlugins
           env[:ui].info(" -- AMI: #{ami}")
           env[:ui].info(" -- Region: #{region}")
           env[:ui].info(" -- Availability Zone: #{availability_zone}") if availability_zone
+          env[:ui].info(" -- SSH Port: #{ssh_port}") if ssh_port
           env[:ui].info(" -- Keypair: #{keypair}") if keypair
           env[:ui].info(" -- Subnet ID: #{subnet_id}") if subnet_id
           env[:ui].info(" -- Private IP: #{private_ip_address}") if private_ip_address
@@ -61,6 +63,7 @@ module VagrantPlugins
               :flavor_id          => instance_type,
               :image_id           => ami,
               :key_name           => keypair,
+              :ssh_port           => ssh_port,
               :private_ip_address => private_ip_address,
               :subnet_id          => subnet_id,
               :tags               => tags

data/lib/vagrant-aws/action/sync_folders.rb

@@ -38,7 +38,7 @@ module VagrantPlugins
             # Rsync over to the guest path using the SSH info
             command = [
               "rsync", "--verbose", "--archive", "-z",
-              "-e", "ssh -p #{ssh_info[:port]} -i '#{ssh_info[:private_key_path]}'",
+              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 

data/lib/vagrant-aws/config.rb

@@ -39,6 +39,16 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :region
 
+      # The EC2 endpoint to connect to
+      #
+      # @return [String]
+      attr_accessor :endpoint
+
+      # The version of the AWS api to use
+      #
+      # @return [String]
+      attr_accessor :version
+
       # The secret access key for accessing AWS.
       #
       # @return [String]
@@ -50,6 +60,11 @@ module VagrantPlugins
       # @return [Array<String>]
       attr_accessor :security_groups
 
+      # The SSH port used by the instance
+      #
+      # @return [int]
+      attr_accessor :ssh_port
+
       # The path to the SSH private key to use with this EC2 instance.
       # This overrides the `config.ssh.private_key_path` variable.
       #
@@ -80,8 +95,11 @@ module VagrantPlugins
         @keypair_name       = UNSET_VALUE
         @private_ip_address = UNSET_VALUE
         @region             = UNSET_VALUE
+        @endpoint           = UNSET_VALUE
+        @version            = UNSET_VALUE
         @secret_access_key  = UNSET_VALUE
         @security_groups    = UNSET_VALUE
+        @ssh_port           = UNSET_VALUE
         @ssh_private_key_path = UNSET_VALUE
         @ssh_username       = UNSET_VALUE
         @subnet_id          = UNSET_VALUE
@@ -176,12 +194,16 @@ module VagrantPlugins
         # generally defaults to this as well.
         @region = "us-east-1" if @region == UNSET_VALUE
         @availability_zone = nil if @availability_zone == UNSET_VALUE
+        @endpoint = nil if @endpoint == UNSET_VALUE
+        @version = nil if @version == UNSET_VALUE
 
         # The security groups are empty by default.
         @security_groups = [] if @security_groups == UNSET_VALUE
 
         # The SSH values by default are nil, and the top-level config
         # `config.ssh` values are used.
+        # The SSH port should be 22 if left unset.
+        @ssh_port = 22 if @ssh_port == UNSET_VALUE
         @ssh_private_key_path = nil if @ssh_private_key_path == UNSET_VALUE
         @ssh_username = nil if @ssh_username == UNSET_VALUE
 

data/lib/vagrant-aws/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module AWS
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3670424498424669674
+      hash: 1300892683038952165
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: