openstack
/
python-tripleoclient
Code Issues Proposed changes

Remove usage of swifthelper.SwiftTempUrlAction 

This would help us removing the action from tripleo-common.

Change-Id: I9023afbb953153443fa7287af0a48310c44b3fd7
This commit is contained in:
Rabi Mishra 2020-03-24 18:35:43 +05:30
parent 08567fb088
commit 50191cddf5
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tripleoclient/workflows/deployment.py
View File

@ -23,7 +23,7 @@ from openstackclient import shell
from tripleo_common.actions import ansible from tripleo_common.actions import ansible
from tripleo_common.actions import config from tripleo_common.actions import config
from tripleo_common.actions import deployment from tripleo_common.actions import deployment
from tripleo_common.actions import swifthelper from tripleo_common.utils import swift as swift_utils
from tripleoclient.constants import ANSIBLE_TRIPLEO_PLAYBOOKS from tripleoclient.constants import ANSIBLE_TRIPLEO_PLAYBOOKS
from tripleoclient.constants import DEFAULT_WORK_DIR from tripleoclient.constants import DEFAULT_WORK_DIR
@ -492,10 +492,10 @@ def config_download_export(clients, plan, config_type):
plan plan
) )
) )
return swifthelper.SwiftTempUrlAction(
container=container_config, return swift_utils.get_temp_url(
obj='{}.tar.gz'.format(container_config) clients.tripleoclient.object_store, container=container_config,
).run(context=context) object_name='{}.tar.gz'.format(container_config))
def get_horizon_url(stack): def get_horizon_url(stack):

7
tripleoclient/workflows/plan_management.py
View File

@ -16,7 +16,6 @@ import yaml
from swiftclient import exceptions as swift_exc from swiftclient import exceptions as swift_exc
from tripleo_common.actions import plan from tripleo_common.actions import plan
from tripleo_common.actions import swifthelper
from tripleo_common.utils import swift as swiftutils from tripleo_common.utils import swift as swiftutils
from tripleo_common.utils import tarball from tripleo_common.utils import tarball
@ -322,8 +321,8 @@ def export_deployment_plan(clients, plan_name):
raise exceptions.WorkflowServiceError( raise exceptions.WorkflowServiceError(
'Exception exporting plan: {}'.format(result.error)) 'Exception exporting plan: {}'.format(result.error))
action = swifthelper.SwiftTempUrlAction( url = swiftutils.get_temp_url(clients.tripleoclient.object_store,
export_container, "{}.tar.gz".format(plan_name), valid=delete_after) container=export_container,
url = action.run(mistral_context) object_name="{}.tar.gz".format(plan_name))
print(url) print(url)
return url return url