Merge pull request #473 from aws/NihalM-patch

Fix for issue #144

ebcli/operations/sshops.py

@@ -132,7 +132,7 @@ def ssh_into_instance(instance_id, keep_open=False, force_open=False, custom_ssh
             custom_ssh = custom_ssh.split()
         else:
             ident_file = _get_ssh_file(keypair_name)
-            custom_ssh = ['ssh', '-i', ident_file]
+            custom_ssh = ['ssh', '-i', ident_file, '-o', 'IdentitiesOnly yes']
 
         custom_ssh.extend([user + '@' + ip])
 

tests/unit/operations/test_sshops.py

@@ -55,7 +55,7 @@ def test_generate_and_upload_keypair__exit_code_0(
                 '-f',
                 os.path.expanduser('~') + '{0}.ssh{0}aws-eb-us-west-2'.format(os.path.sep),
                 '-C',
-                'aws-eb-us-west-2'
+                'aws-eb-us-west-2'                
             ]
         )
 
@@ -320,7 +320,7 @@ def test_ssh_into_instance__uses_private_address(
         call_mock.return_value = 0
 
         sshops.ssh_into_instance('instance-id')
-        call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', '[email protected]'])
+        call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', '-o', 'IdentitiesOnly yes', '[email protected]'])
 
     @mock.patch('ebcli.operations.sshops.ec2.describe_instance')
     @mock.patch('ebcli.operations.sshops.ec2.describe_security_group')
@@ -346,7 +346,7 @@ def test_ssh_into_instance__ssh_rule_exists(
         sshops.ssh_into_instance('instance-id')
         authorize_ssh_mock.assert_not_called()
         revoke_ssh_mock.assert_not_called()
-        call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', '[email protected]'])
+        call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', '-o', 'IdentitiesOnly yes', '[email protected]'])
 
     @mock.patch('ebcli.operations.sshops.ec2.describe_instance')
     @mock.patch('ebcli.operations.sshops.ec2.describe_security_group')
@@ -372,7 +372,7 @@ def test_ssh_into_instance__no_ssh_rule_exists(
         sshops.ssh_into_instance('instance-id')
         authorize_ssh_mock.assert_called_once_with('sg-12312313')
         revoke_ssh_mock.assert_called_once_with('sg-12312313')
-        call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', '[email protected]'])
+        call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', '-o', 'IdentitiesOnly yes', '[email protected]'])
 
     @mock.patch('ebcli.operations.sshops.prompt_for_ec2_keyname')
     @mock.patch('ebcli.operations.sshops.commonops.update_environment')