From 4ab09cb887878d6efdbcf15fe9c6cef1e019ad16 Mon Sep 17 00:00:00 2001 From: ramishra Date: Wed, 19 May 2021 18:16:14 +0530 Subject: [PATCH] Remove usage of tripleo_common.actions.ansible Now that we've new releases of tripleo-common, we can change this and drop the action module from tripleo-common. Change-Id: I26e5781b24d1d071858d135a6a3b09aa238ba31c --- tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py | 10 +++++----- tripleoclient/v1/tripleo_config.py | 2 +- tripleoclient/v1/tripleo_deploy.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py b/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py index 3a9ce6e10..52ae75f59 100644 --- a/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py +++ b/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py @@ -777,7 +777,7 @@ class TestDeployUndercloud(TestPluginV1): @mock.patch('tripleoclient.utils.copy_clouds_yaml') @mock.patch('tripleoclient.v1.tripleo_deploy.Deploy.' '_download_stack_outputs') - @mock.patch('tripleo_common.actions.ansible.' + @mock.patch('tripleo_common.utils.ansible.' 'write_default_ansible_cfg') # TODO(cjeanner) drop once we have proper oslo.privsep @mock.patch('os.chmod') @@ -872,7 +872,7 @@ class TestDeployUndercloud(TestPluginV1): @mock.patch('tripleoclient.utils.copy_clouds_yaml') @mock.patch('tripleoclient.v1.tripleo_deploy.Deploy.' '_download_stack_outputs') - @mock.patch('tripleo_common.actions.ansible.' + @mock.patch('tripleo_common.utils.ansible.' 'write_default_ansible_cfg') # TODO(cjeanner) drop once we have proper oslo.privsep @mock.patch('os.chmod') @@ -957,7 +957,7 @@ class TestDeployUndercloud(TestPluginV1): @mock.patch('tripleoclient.utils.copy_clouds_yaml') @mock.patch('tripleoclient.v1.tripleo_deploy.Deploy.' '_download_stack_outputs') - @mock.patch('tripleo_common.actions.ansible.' + @mock.patch('tripleo_common.utils.ansible.' 'write_default_ansible_cfg') # TODO(cjeanner) drop once we have proper oslo.privsep @mock.patch('os.chmod') @@ -1116,7 +1116,7 @@ class TestDeployUndercloud(TestPluginV1): @mock.patch('tripleoclient.utils.copy_clouds_yaml') @mock.patch('tripleoclient.v1.tripleo_deploy.Deploy.' '_download_stack_outputs') - @mock.patch('tripleo_common.actions.ansible.' + @mock.patch('tripleo_common.utils.ansible.' 'write_default_ansible_cfg') # TODO(cjeanner) drop once we have proper oslo.privsep @mock.patch('os.chmod') @@ -1175,7 +1175,7 @@ class TestDeployUndercloud(TestPluginV1): @mock.patch('tripleoclient.utils.copy_clouds_yaml') @mock.patch('tripleoclient.v1.tripleo_deploy.Deploy.' '_download_stack_outputs') - @mock.patch('tripleo_common.actions.ansible.' + @mock.patch('tripleo_common.utils.ansible.' 'write_default_ansible_cfg') # TODO(cjeanner) drop once we have proper oslo.privsep @mock.patch('os.chmod') diff --git a/tripleoclient/v1/tripleo_config.py b/tripleoclient/v1/tripleo_config.py index 4d0e72d75..314ecce82 100644 --- a/tripleoclient/v1/tripleo_config.py +++ b/tripleoclient/v1/tripleo_config.py @@ -23,7 +23,7 @@ from tripleoclient import constants from tripleoclient import utils # For ansible.cfg generation -from tripleo_common.actions import ansible +from tripleo_common.utils import ansible class GenerateAnsibleConfig(command.Command): diff --git a/tripleoclient/v1/tripleo_deploy.py b/tripleoclient/v1/tripleo_deploy.py index cb81b1ffe..4c3f9249e 100644 --- a/tripleoclient/v1/tripleo_deploy.py +++ b/tripleoclient/v1/tripleo_deploy.py @@ -45,7 +45,7 @@ from tripleo_common.utils import parameters from tripleo_common.utils import passwords as password_utils # For ansible download and config generation -from tripleo_common.actions import ansible +from tripleo_common.utils import ansible from tripleo_common.inventory import TripleoInventory from tripleo_common.utils import config