openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Remove usage of tripleo_common.actions.ansible"

Browse Source
This commit is contained in:
Zuul
2021-05-29 12:14:49 +00:00
committed by Gerrit Code Review
parent 1b8963dce3 4ab09cb887
commit 7adcd64952
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py
View File

@@ -777,7 +777,7 @@ class TestDeployUndercloud(TestPluginV1):
@mock.patch('tripleoclient.utils.copy_clouds_yaml') @mock.patch('tripleoclient.utils.copy_clouds_yaml')
@mock.patch('tripleoclient.v1.tripleo_deploy.Deploy.' @mock.patch('tripleoclient.v1.tripleo_deploy.Deploy.'
'_download_stack_outputs') '_download_stack_outputs')
@mock.patch('tripleo_common.actions.ansible.' @mock.patch('tripleo_common.utils.ansible.'
'write_default_ansible_cfg') 'write_default_ansible_cfg')
# TODO(cjeanner) drop once we have proper oslo.privsep # TODO(cjeanner) drop once we have proper oslo.privsep
@mock.patch('os.chmod') @mock.patch('os.chmod')
@@ -872,7 +872,7 @@ class TestDeployUndercloud(TestPluginV1):
@mock.patch('tripleoclient.utils.copy_clouds_yaml') @mock.patch('tripleoclient.utils.copy_clouds_yaml')
@mock.patch('tripleoclient.v1.tripleo_deploy.Deploy.' @mock.patch('tripleoclient.v1.tripleo_deploy.Deploy.'
'_download_stack_outputs') '_download_stack_outputs')
@mock.patch('tripleo_common.actions.ansible.' @mock.patch('tripleo_common.utils.ansible.'
'write_default_ansible_cfg') 'write_default_ansible_cfg')
# TODO(cjeanner) drop once we have proper oslo.privsep # TODO(cjeanner) drop once we have proper oslo.privsep
@mock.patch('os.chmod') @mock.patch('os.chmod')
@@ -957,7 +957,7 @@ class TestDeployUndercloud(TestPluginV1):
@mock.patch('tripleoclient.utils.copy_clouds_yaml') @mock.patch('tripleoclient.utils.copy_clouds_yaml')
@mock.patch('tripleoclient.v1.tripleo_deploy.Deploy.' @mock.patch('tripleoclient.v1.tripleo_deploy.Deploy.'
'_download_stack_outputs') '_download_stack_outputs')
@mock.patch('tripleo_common.actions.ansible.' @mock.patch('tripleo_common.utils.ansible.'
'write_default_ansible_cfg') 'write_default_ansible_cfg')
# TODO(cjeanner) drop once we have proper oslo.privsep # TODO(cjeanner) drop once we have proper oslo.privsep
@mock.patch('os.chmod') @mock.patch('os.chmod')
@@ -1116,7 +1116,7 @@ class TestDeployUndercloud(TestPluginV1):
@mock.patch('tripleoclient.utils.copy_clouds_yaml') @mock.patch('tripleoclient.utils.copy_clouds_yaml')
@mock.patch('tripleoclient.v1.tripleo_deploy.Deploy.' @mock.patch('tripleoclient.v1.tripleo_deploy.Deploy.'
'_download_stack_outputs') '_download_stack_outputs')
@mock.patch('tripleo_common.actions.ansible.' @mock.patch('tripleo_common.utils.ansible.'
'write_default_ansible_cfg') 'write_default_ansible_cfg')
# TODO(cjeanner) drop once we have proper oslo.privsep # TODO(cjeanner) drop once we have proper oslo.privsep
@mock.patch('os.chmod') @mock.patch('os.chmod')
@@ -1175,7 +1175,7 @@ class TestDeployUndercloud(TestPluginV1):
@mock.patch('tripleoclient.utils.copy_clouds_yaml') @mock.patch('tripleoclient.utils.copy_clouds_yaml')
@mock.patch('tripleoclient.v1.tripleo_deploy.Deploy.' @mock.patch('tripleoclient.v1.tripleo_deploy.Deploy.'
'_download_stack_outputs') '_download_stack_outputs')
@mock.patch('tripleo_common.actions.ansible.' @mock.patch('tripleo_common.utils.ansible.'
'write_default_ansible_cfg') 'write_default_ansible_cfg')
# TODO(cjeanner) drop once we have proper oslo.privsep # TODO(cjeanner) drop once we have proper oslo.privsep
@mock.patch('os.chmod') @mock.patch('os.chmod')

2
tripleoclient/v1/tripleo_config.py
View File

@@ -23,7 +23,7 @@ from tripleoclient import constants
from tripleoclient import utils from tripleoclient import utils
# For ansible.cfg generation # For ansible.cfg generation
from tripleo_common.actions import ansible from tripleo_common.utils import ansible
class GenerateAnsibleConfig(command.Command): class GenerateAnsibleConfig(command.Command):

2
tripleoclient/v1/tripleo_deploy.py
View File

@@ -45,7 +45,7 @@ from tripleo_common.utils import parameters
from tripleo_common.utils import passwords as password_utils from tripleo_common.utils import passwords as password_utils
# For ansible download and config generation # 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.inventory import TripleoInventory
from tripleo_common.utils import config from tripleo_common.utils import config