openstack/deb-mistral
Code Issues Proposed changes

Fixing failing functional tests for Cinder and Heat actions

Browse Source 
Change-Id: Ia8acb0786009fc66f7a68a2dfae9f37d7ef61506
This commit is contained in:
Renat Akhmerov 2016-04-11 13:39:19 +07:00
parent 29732bf826
commit 8821deebe9
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mistral/actions/openstack/actions.py
View File

@ -179,7 +179,10 @@ class HeatAction(base.OpenStackAction):
endpoint_url = keystone_utils.format_url(
heat_endpoint.url,
{'tenant_id': ctx.project_id}
{
'tenant_id': ctx.project_id,
'project_id': ctx.project_id
}
)
return self._client_class(
@ -226,7 +229,10 @@ class CinderAction(base.OpenStackAction):
cinder_url = keystone_utils.format_url(
cinder_endpoint.url,
{'tenant_id': ctx.project_id}
{
'tenant_id': ctx.project_id,
'project_id': ctx.project_id
}
)
client = self._client_class(

9
mistral/actions/openstack/base.py
View File

@ -14,10 +14,15 @@
import abc
import inspect
import traceback
from oslo_log import log
from mistral.actions import base
from mistral import exceptions as exc
LOG = log.getLogger(__name__)
class OpenStackAction(base.Action):
"""OpenStack Action.
@ -77,6 +82,10 @@ class OpenStackAction(base.Action):
return result
except Exception as e:
# Print the traceback for the last exception so that we can see
# where the issue comes from.
LOG.warning(traceback.format_exc())
e_str = '%s: %s' % (type(e), e.message)
raise exc.ActionException(