Code Review
/
snaps.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Added password support for SSH and Ansible Additional protections when initial...
[snaps.git]
/
snaps
/
provisioning
/
tests
/
ansible_utils_tests.py
diff --git
a/snaps/provisioning/tests/ansible_utils_tests.py
b/snaps/provisioning/tests/ansible_utils_tests.py
index
7600002
..
851dd64
100644
(file)
--- a/
snaps/provisioning/tests/ansible_utils_tests.py
+++ b/
snaps/provisioning/tests/ansible_utils_tests.py
@@
-266,8
+266,9
@@
class AnsibleProvisioningTests(OSIntegrationTestCase):
retval = self.inst_creator.apply_ansible_playbook(relative_pb_path)
self.assertEqual(0, retval)
retval = self.inst_creator.apply_ansible_playbook(relative_pb_path)
self.assertEqual(0, retval)
- ssh = ansible_utils.ssh_client(ip, user, priv_key,
- self.os_creds.proxy_settings)
+ ssh = ansible_utils.ssh_client(
+ ip, user, private_key_filepath=priv_key,
+ proxy_settings=self.os_creds.proxy_settings)
self.assertIsNotNone(ssh)
scp = None
try:
self.assertIsNotNone(ssh)
scp = None
try:
@@
-329,13
+330,13
@@
class AnsibleProvisioningTests(OSIntegrationTestCase):
relative_pb_path = pkg_resources.resource_filename(
'snaps.provisioning.tests.playbooks',
'template_playbook.yml')
relative_pb_path = pkg_resources.resource_filename(
'snaps.provisioning.tests.playbooks',
'template_playbook.yml')
- retval = self.inst_creator.apply_ansible_playbook(relative_pb_path,
- variables={
- 'name': 'Foo'})
+ retval = self.inst_creator.apply_ansible_playbook(
+ relative_pb_path, variables={'name': 'Foo'})
self.assertEqual(0, retval)
self.assertEqual(0, retval)
- ssh = ansible_utils.ssh_client(ip, user, priv_key,
- self.os_creds.proxy_settings)
+ ssh = ansible_utils.ssh_client(
+ ip, user, private_key_filepath=priv_key,
+ proxy_settings=self.os_creds.proxy_settings)
self.assertIsNotNone(ssh)
scp = None
self.assertIsNotNone(ssh)
scp = None