commit 40b496c45c63f948ca5b074308c42c7fed7e8066
author Jenkins <jenkins@review.openstack.org> Thu Jun 16 21:51:43 2016 +0000
committer Gerrit Code Review <review@openstack.org> Thu Jun 16 21:51:44 2016 +0000
tree 7c0030588187213381ba8a333dc4ac8fb4abb4b0
parent 9253047d609288fe1b1dfd1acd089263f43e4ba3
parent 0abbfcb6d1042f65c42736a3267bd2e89176f98d

Merge "Add operator role to heat stack owner"

tempest/cmd/account_generator.py

diff --git a/tempest/cmd/account_generator.py b/tempest/cmd/account_generator.py
index db323de..f9d7a9b 100755
--- a/tempest/cmd/account_generator.py
+++ b/tempest/cmd/account_generator.py
@@ -157,7 +157,8 @@
         spec.append([CONF.object_storage.operator_role])
         spec.append([CONF.object_storage.reseller_admin_role])
     if CONF.service_available.heat:
-        spec.append([CONF.orchestration.stack_owner_role])
+        spec.append([CONF.orchestration.stack_owner_role,
+                     CONF.object_storage.operator_role])
     if admin:
         spec.append('admin')
     resources = []

tempest/tests/cmd/test_account_generator.py

diff --git a/tempest/tests/cmd/test_account_generator.py b/tempest/tests/cmd/test_account_generator.py
index f253802..b3931d1 100755
--- a/tempest/tests/cmd/test_account_generator.py
+++ b/tempest/tests/cmd/test_account_generator.py
@@ -234,7 +234,7 @@
         self.assertIn('admin', resource_types)
         self.assertIn(['fake_operator'], resource_types)
         self.assertIn(['fake_reseller'], resource_types)
-        self.assertIn(['fake_owner'], resource_types)
+        self.assertIn(['fake_owner', 'fake_operator'], resource_types)
         for resource in resources:
             self.assertIsNotNone(resource[1].network)
             self.assertIsNotNone(resource[1].router)