diff options
| author | Ed Leafe <ed@leafe.com> | 2010-12-17 11:14:32 -0600 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2010-12-17 11:14:32 -0600 |
| commit | 02d2e305bd71aec3f723a42da620d2939e041f0c (patch) | |
| tree | 670cd99a319674c53feec8b2c2c12489aefab9a6 | |
| parent | d16a41f552c70708a909067ce8555b40c3785027 (diff) | |
| download | nova-02d2e305bd71aec3f723a42da620d2939e041f0c.tar.gz nova-02d2e305bd71aec3f723a42da620d2939e041f0c.tar.xz nova-02d2e305bd71aec3f723a42da620d2939e041f0c.zip | |
Fixed some old code that was merged incorrectly
| -rw-r--r-- | nova/auth/manager.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/nova/auth/manager.py b/nova/auth/manager.py index 5a7020a93..11c3bd6df 100644 --- a/nova/auth/manager.py +++ b/nova/auth/manager.py @@ -478,13 +478,10 @@ class AuthManager(object): if member_users: member_users = [User.safe_id(u) for u in member_users] with self.driver() as drv: - try: - project_dict = drv.create_project(name, + project_dict = drv.create_project(name, User.safe_id(manager_user), description, member_users) - except: - project_dict = drv.get_project(name) if project_dict: project = Project(**project_dict) return project @@ -607,10 +604,7 @@ class AuthManager(object): if secret == None: secret = str(uuid.uuid4()) with self.driver() as drv: - try: - user_dict = drv.create_user(name, access, secret, admin) - except: - user_dict = drv.get_user(name) + user_dict = drv.create_user(name, access, secret, admin) if user_dict: return User(**user_dict) |