openstack/deb-heat
Code Issues Proposed changes

Merge "Remove unconditional return of user_id"

Browse Source
This commit is contained in:
Jenkins 2016-01-14 04:17:20 +00:00 committed by Gerrit Code Review
commit 198ee80524
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
heat/engine/resources/stack_user.py
View File

@ -72,15 +72,6 @@ class StackUser(resource.Resource):
user_id = self.data().get('user_id') user_id = self.data().get('user_id')
if user_id: if user_id:
return user_id return user_id
else:
# FIXME(shardy): This is a legacy hack for backwards compatibility
# remove after an appropriate transitional period...
# Assume this is a resource that was created with
# a previous version of heat and that the resource_id
# is the user_id
if self.resource_id:
self.data_set('user_id', self.resource_id)
return self.resource_id
def handle_delete(self): def handle_delete(self):
self._delete_user() self._delete_user()

7
releasenotes/notes/legacy-stack-user-id-cebbad8b0f2ed490.yaml Normal file
View File

@ -0,0 +1,7 @@
---
upgrade:
- If upgrading with pre-icehouse stacks which contain resources that create
users (such as OS::Nova::Server, OS::Heat::SoftwareDeployment, and
OS::Heat::WaitConditionHandle), it is possible that the users will not be
removed upon stack deletion due to the removal of a legacy fallback code
path. In such a situation, these users will require manual removal.