commit 222eb6dc194c77b6e9b549832b23e5e42fcfc928
author Jenkins <jenkins@review.openstack.org> Thu Sep 10 21:01:11 2015 +0000
committer Gerrit Code Review <review@openstack.org> Thu Sep 10 21:01:11 2015 +0000
tree 368e056872bea095295d30c00c46eccaf997eb62
parent c8c6fcc89504d3f24f2ce3003ddebd4c7555737d
parent 7b05b3473874832edcdf14121c858bf6c391562e

Merge "Split the operator and reseller users in the account generator"

tempest/cmd/account_generator.py

diff --git a/tempest/cmd/account_generator.py b/tempest/cmd/account_generator.py
index 49d5f8c..ce7728e 100755
--- a/tempest/cmd/account_generator.py
+++ b/tempest/cmd/account_generator.py
@@ -287,10 +287,13 @@
                        [CONF.object_storage.operator_role])}]
     if CONF.service_available.swift:
         spec.append({'number': 1,
-                     'prefix': 'swift_admin',
+                     'prefix': 'swift_operator',
                      'roles': (CONF.auth.tempest_roles +
-                               [CONF.object_storage.operator_role,
-                                CONF.object_storage.reseller_admin_role])})
+                               [CONF.object_storage.operator_role])})
+        spec.append({'number': 1,
+                     'prefix': 'swift_reseller_admin',
+                     'roles': (CONF.auth.tempest_roles +
+                               [CONF.object_storage.reseller_admin_role])})
     if CONF.service_available.heat:
         spec.append({'number': 1,
                      'prefix': 'stack_owner',