openstack/deb-murano
Code Issues Proposed changes

Merge "Attempt to fix congress client initialization"

Browse Source
This commit is contained in:
Jenkins 2015-08-07 00:45:55 +00:00 committed by Gerrit Code Review
commit 96a2d30ccb
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
murano/engine/client_manager.py
View File

@ -15,6 +15,7 @@
from eventlet import semaphore from eventlet import semaphore
import heatclient.client as hclient import heatclient.client as hclient
import keystoneclient import keystoneclient
import keystoneclient.auth.identity.access as access
import muranoclient.v1.client as muranoclient import muranoclient.v1.client as muranoclient
import neutronclient.v2_0.client as nclient import neutronclient.v2_0.client as nclient
from oslo_config import cfg from oslo_config import cfg
@ -100,10 +101,7 @@ class ClientManager(object):
use_trusts = False use_trusts = False
def factory(keystone_client, auth_token): def factory(keystone_client, auth_token):
auth = keystoneclient.auth.identity.v2.Token( auth = access.AccessInfoPlugin(keystone_client.auth_ref)
auth_url=cfg.CONF.keystone_authtoken.auth_uri,
tenant_name=keystone_client.tenant_name,
token=auth_token)
session = keystoneclient.session.Session(auth=auth) session = keystoneclient.session.Session(auth=auth)
return congress_client.Client(session=session, return congress_client.Client(session=session,
service_type='policy') service_type='policy')
@ -198,7 +196,6 @@ class ClientManager(object):
endpoint_type=endpoint_type) endpoint_type=endpoint_type)
return mistralclient.client(mistral_url=mistral_url, return mistralclient.client(mistral_url=mistral_url,
auth_url=keystone_client.auth_url,
project_id=keystone_client.tenant_id, project_id=keystone_client.tenant_id,
endpoint_type=endpoint_type, endpoint_type=endpoint_type,
service_type=service_type, service_type=service_type,

2
murano/engine/system/mistralclient.py
View File

@ -37,7 +37,7 @@ class MistralClient(murano_object.MuranoObject):
def upload(self, _context, definition): def upload(self, _context, definition):
mistral_client = self._clients.get_mistral_client(_context) mistral_client = self._clients.get_mistral_client(_context)
mistral_client.workflows.update(definition) mistral_client.workflows.create(definition)
def run(self, _context, name, timeout=600, inputs=None, params=None): def run(self, _context, name, timeout=600, inputs=None, params=None):
mistral_client = self._clients.get_mistral_client(_context) mistral_client = self._clients.get_mistral_client(_context)