diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-05-19 11:12:22 -0600 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-05-19 11:14:29 -0600 |
| commit | 0f6dc6e618b5546a652b9a06ac46ae332ea1c4c3 (patch) | |
| tree | c7cc7bc8ab028ad9aecd8bbd7d24387134f35054 /snaps/provisioning | |
| parent | 8d8af3c360b360c982b44ba343a97cf5949c8c20 (diff) | |
Fixed error in ansible_utils_tests.py and added ansible helper
method to the OpenStackVMInstance class.
Test error was due to the image configuration having the incorrect
user applied. The helper method will make it easier for adhoc
ansible playbooks to be applied to running instances.
JIRA: SNAPS-83
Change-Id: I6b229e0adb836dd3d5ea7b468d38d93f880589a2
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/provisioning')
| -rw-r--r-- | snaps/provisioning/tests/ansible_utils_tests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/snaps/provisioning/tests/ansible_utils_tests.py b/snaps/provisioning/tests/ansible_utils_tests.py index 52977f0..c39bde4 100644 --- a/snaps/provisioning/tests/ansible_utils_tests.py +++ b/snaps/provisioning/tests/ansible_utils_tests.py @@ -171,8 +171,7 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): user = self.inst_creator.get_image_user() priv_key = self.inst_creator.keypair_settings.private_filepath - retval = ansible_utils.apply_playbook('provisioning/tests/playbooks/simple_playbook.yml', [ip], user, priv_key, - proxy_setting=self.os_creds.proxy_settings) + retval = self.inst_creator.apply_ansible_playbook('provisioning/tests/playbooks/simple_playbook.yml') self.assertEqual(0, retval) ssh = ansible_utils.ssh_client(ip, user, priv_key, self.os_creds.proxy_settings) @@ -203,8 +202,9 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): user = self.inst_creator.get_image_user() priv_key = self.inst_creator.keypair_settings.private_filepath - ansible_utils.apply_playbook('provisioning/tests/playbooks/template_playbook.yml', [ip], user, priv_key, - variables={'name': 'Foo'}, proxy_setting=self.os_creds.proxy_settings) + retval = self.inst_creator.apply_ansible_playbook('provisioning/tests/playbooks/template_playbook.yml', + variables={'name': 'Foo'}) + self.assertEqual(0, retval) ssh = ansible_utils.ssh_client(ip, user, priv_key, self.os_creds.proxy_settings) self.assertIsNotNone(ssh) |