Backported #784 to v2

ansible · Apr 10, 2017 · ea730d6 · ea730d6
1 parent 8463b1c
commit ea730d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/molecule/driver/vagrant.py b/molecule/driver/vagrant.py
@@ -105,10 +105,10 @@ def ansible_connection_options(self, instance_name):
             d = self._get_instance_config(instance_name)
 
             return {
-                'ansible_ssh_user': d['User'],
-                'ansible_ssh_host': d['HostName'],
-                'ansible_ssh_port': d['Port'],
-                'ansible_ssh_private_key_file': d['IdentityFile'],
+                'ansible_user': d['User'],
+                'ansible_host': d['HostName'],
+                'ansible_port': d['Port'],
+                'ansible_private_key_file': d['IdentityFile'],
                 'connection': 'ssh',
                 'ansible_ssh_extra_args': ' '.join(ssh_options),
             }

diff --git a/test/unit/driver/test_vagrant.py b/test/unit/driver/test_vagrant.py
@@ -119,10 +119,10 @@ def test_ansible_connection_options(mocker, vagrant_instance):
         }]
     }
     x = {
-        'ansible_ssh_host': '127.0.0.1',
-        'ansible_ssh_port': 2222,
-        'ansible_ssh_user': 'vagrant',
-        'ansible_ssh_private_key_file': '/foo/bar',
+        'ansible_host': '127.0.0.1',
+        'ansible_port': 2222,
+        'ansible_user': 'vagrant',
+        'ansible_private_key_file': '/foo/bar',
         'connection': 'ssh',
         'ansible_ssh_extra_args': ('-o UserKnownHostsFile=/dev/null '
                                    '-o ControlMaster=auto '