vagrant-aws 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.1 (April 16, 2013)
+
+* Got rid of extranneous references to old SSH settings.
+
 # 0.2.0 (April 16, 2013)
 
 * Add support for `vagrant ssh -c` [GH-42]

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

@@ -29,16 +29,10 @@ module VagrantPlugins
             return nil
           end
 
-          # Get the configuration
-          region = machine.provider_config.region
-          config = machine.provider_config.get_region_config(region)
-
           # Read the DNS info
           return {
             :host => server.dns_name || server.private_ip_address,
-            :port => config.ssh_port,
-            :private_key_path => config.ssh_private_key_path,
-            :username => config.ssh_username
+            :port => 22
           }
         end
       end

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

@@ -28,7 +28,6 @@ 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
@@ -52,7 +51,6 @@ 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
@@ -64,7 +62,6 @@ 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/config.rb

@@ -65,23 +65,6 @@ 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.
-      #
-      # @return [String]
-      attr_accessor :ssh_private_key_path
-
-      # The SSH username to use with this EC2 instance. This overrides
-      # the `config.ssh.username` variable.
-      #
-      # @return [String]
-      attr_accessor :ssh_username
-
       # The subnet ID to launch the machine into (VPC).
       #
       # @return [String]
@@ -116,9 +99,6 @@ module VagrantPlugins
         @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
         @tags               = {}
         @user_data          = UNSET_VALUE
@@ -223,13 +203,6 @@ module VagrantPlugins
         # 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
-
         # Subnet is nil by default otherwise we'd launch into VPC.
         @subnet_id = nil if @subnet_id == UNSET_VALUE
 
@@ -282,11 +255,6 @@ module VagrantPlugins
           end
 
           errors << I18n.t("vagrant_aws.config.ami_required") if config.ami.nil?
-
-          if config.ssh_private_key_path && \
-            !File.file?(File.expand_path(config.ssh_private_key_path, machine.env.root_path))
-            errors << I18n.t("vagrant_aws.config.private_key_missing")
-          end
         end
 
         { "AWS Provider" => errors }

data/lib/vagrant-aws/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module AWS
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/vagrant-aws/config_spec.rb

@@ -25,8 +25,6 @@ describe VagrantPlugins::AWS::Config do
     its("region")            { should == "us-east-1" }
     its("secret_access_key") { should be_nil }
     its("security_groups")   { should == [] }
-    its("ssh_private_key_path") { should be_nil }
-    its("ssh_username")      { should be_nil }
     its("subnet_id")         { should be_nil }
     its("tags")              { should == {} }
     its("user_data")         { should be_nil }
@@ -41,7 +39,7 @@ describe VagrantPlugins::AWS::Config do
     [:access_key_id, :ami, :availability_zone, :instance_ready_timeout,
       :instance_type, :keypair_name,
       :region, :secret_access_key, :security_groups,
-      :ssh_private_key_path, :ssh_username, :subnet_id, :tags,
+      :subnet_id, :tags,
       :use_iam_profile, :user_data].each do |attribute|
 
       it "should not default #{attribute} if overridden" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-aws
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1824347495740521097
+      hash: -1807397397089966337
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: