diff options
| author | Steven Hardy <shardy@redhat.com> | 2014-02-11 12:37:20 +0000 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2014-03-08 07:31:41 +0000 |
| commit | 4e36926d0161120e972e18ddfca31cf8a4a37e96 (patch) | |
| tree | 900a1c181c8966443e5b56d8eef67eabfcc1578e /heat/tests/fakes.py | |
| parent | c7b6a7d5a85801f7324764816c3c53344e84fb10 (diff) | |
| download | heat-4e36926d0161120e972e18ddfca31cf8a4a37e96.tar.gz | |
migrate User/AccessKey resources to StackUser base class
migrate the User/AccessKey resources to use the StackUser
base class, and therefore convert to stack domain users.
Note that becuse the User resource inherits from StackUser,
and the keypair is managed by that resource now, we have
to update both resources at the same time, as it's not
possible to update individually and keep them both working.
This (finally! :) resolves bug #1089261 and allows all
resources to be created even if the user creating the
stack doesn't have the required roles to create keystone
users.
Closes-Bug: #1089261
blueprint: instance-users
Change-Id: I854644e7669150521f8904cdb76c292519ef4167
Diffstat (limited to 'heat/tests/fakes.py')
| -rw-r--r-- | heat/tests/fakes.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/heat/tests/fakes.py b/heat/tests/fakes.py index a4c202141..0914dc7d1 100644 --- a/heat/tests/fakes.py +++ b/heat/tests/fakes.py @@ -114,8 +114,8 @@ class FakeKeystoneClient(object): if user_id == self.user_id: return self.creds - def delete_ec2_keypair(self, user_id=None, access=None, - credential_id=None): + def delete_ec2_keypair(self, credential_id=None, user_id=None, + access=None): if user_id == self.user_id and access == self.creds.access: self.creds = None else: |