| commit | 545e8f00d207b637407e3080c0aabff4b4426d5a | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Sat Jan 23 10:45:02 2016 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Sat Jan 23 10:45:02 2016 +0000 |
| tree | 250ae90a48096a50235fedf26b3843aaa761b4cd | |
| parent | 6e08048a9c14b426319e24481299a2732d0d8f3b [diff] | |
| parent | bfab6b910e2b43ad61a747fc54a9d179f07991aa [diff] |
Merge "Fix logic in dump_accounts"
diff --git a/tempest/cmd/account_generator.py b/tempest/cmd/account_generator.py index 32d6ef1..ddfc75d 100755 --- a/tempest/cmd/account_generator.py +++ b/tempest/cmd/account_generator.py
@@ -390,7 +390,7 @@ 'password': user['pass'], 'roles': user['roles'] } - if 'network' or 'router' in user: + if 'network' in user or 'router' in user: account['resources'] = {} if 'network' in user: account['resources']['network'] = user['network']