Attachment 613499 Details for Bug 857752 – patch which triggers keystone to assert incorrectly

[patch] patch which triggers keystone to assert incorrectly

heat-breaks-keystone.patch (text/plain), 4.77 KB, created by Steven Dake on 2012-09-16 19:20:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steven Dake

Created: 2012-09-16 19:20:54 UTC

Size: 4.77 KB

patch

obsolete

>diff --git a/heat/engine/auth.py b/heat/engine/auth.py
>index 3712d11..40970c6 100644
>--- a/heat/engine/auth.py
>+++ b/heat/engine/auth.py
>@@ -70,8 +70,11 @@ def authenticate(con, service_type='orchestration', service_name='heat'):
>     """
> 
>     if con.password is not None:
>-        nova = client.Client(con.username, con.password,
>-                             con.tenant, con.auth_url,
>+        nova = client.Client(username=con.username,
>+                             api_key=con.password,
>+                             project_id=con.tenant,
>+                             auth_url=con.auth_url,
>+                             proxy_token=con.auth_token,
>                              service_type=service_type,
>                              service_name=service_name)
>         nova.authenticate()
>diff --git a/heat/engine/manager.py b/heat/engine/manager.py
>index 73c0e54..f7da9d9 100644
>--- a/heat/engine/manager.py
>+++ b/heat/engine/manager.py
>@@ -69,8 +69,6 @@ class EngineManager(manager.Manager):
>         arg1 -> RPC context.
>         arg2 -> Name of the stack to look up.
>         """
>-        auth.authenticate(context)
>-
>         s = db_api.stack_get_by_name(context, stack_name)
>         if s:
>             stack = parser.Stack.load(context, s.id)
>@@ -101,8 +99,6 @@ class EngineManager(manager.Manager):
>         arg2 -> Name of the stack you want to see, or None to see all
>         arg3 -> Dict of http request parameters passed in from API side.
>         """
>-        auth.authenticate(context)
>-
>         if stack_identity is not None:
>             stacks = [self._get_stack(context, stack_identity)]
>         else:
>@@ -128,8 +124,6 @@ class EngineManager(manager.Manager):
>         """
>         logger.info('template is %s' % template)
> 
>-        auth.authenticate(context)
>-
>         if db_api.stack_get_by_name(None, stack_name):
>             raise AttributeError('Stack already exists with that name')
> 
>@@ -165,8 +159,6 @@ class EngineManager(manager.Manager):
>         """
>         logger.info('template is %s' % template)
> 
>-        auth.authenticate(context)
>-
>         # Get the database representation of the existing stack
>         db_stack = self._get_stack(context, stack_identity)
> 
>@@ -199,8 +191,6 @@ class EngineManager(manager.Manager):
>         arg3 -> Template of stack you want to create.
>         arg4 -> Params passed from API.
>         """
>-        auth.authenticate(context)
>-
>         logger.info('validate_template')
>         if template is None:
>             msg = _("No Template provided.")
>@@ -238,7 +228,6 @@ class EngineManager(manager.Manager):
>         arg2 -> Name of the stack you want to see.
>         arg3 -> Dict of http request parameters passed in from API side.
>         """
>-        auth.authenticate(context)
>         s = self._get_stack(context, stack_identity)
>         if s:
>             return s.raw_template.template
>@@ -251,9 +240,6 @@ class EngineManager(manager.Manager):
>         arg2 -> Name of the stack you want to delete.
>         arg3 -> Params passed from API.
>         """
>-
>-        auth.authenticate(context)
>-
>         st = self._get_stack(context, stack_identity)
> 
>         logger.info('deleting stack %s' % st.name)
>@@ -269,9 +255,6 @@ class EngineManager(manager.Manager):
>         arg2 -> Name of the stack you want to get events for.
>         arg3 -> Params passed from API.
>         """
>-
>-        auth.authenticate(context)
>-
>         if stack_identity is not None:
>             st = self._get_stack(context, stack_identity)
> 
>@@ -282,9 +265,6 @@ class EngineManager(manager.Manager):
>         return {'events': [api.format_event(context, e) for e in events]}
> 
>     def event_create(self, context, event):
>-
>-        auth.authenticate(context)
>-
>         stack_name = event['stack']
>         resource_name = event['resource']
>         stack = db_api.stack_get_by_name(context, stack_name)
>@@ -312,8 +292,6 @@ class EngineManager(manager.Manager):
>             return [msg, None]
> 
>     def describe_stack_resource(self, context, stack_identity, resource_name):
>-        auth.authenticate(context)
>-
>         s = self._get_stack(context, stack_identity)
> 
>         stack = parser.Stack.load(context, s.id)
>@@ -328,8 +306,6 @@ class EngineManager(manager.Manager):
> 
>     def describe_stack_resources(self, context, stack_identity,
>                                  physical_resource_id, logical_resource_id):
>-        auth.authenticate(context)
>-
>         if stack_identity is not None:
>             s = self._get_stack(context, stack_identity)
>         else:
>@@ -355,8 +331,6 @@ class EngineManager(manager.Manager):
>                                          name_match(resource)]
> 
>     def list_stack_resources(self, context, stack_identity):
>-        auth.authenticate(context)
>-
>         s = self._get_stack(context, stack_identity)
> 
>         stack = parser.Stack.load(context, s.id)

Actions: View | Diff

Attachments on bug 857752: 613499