commit 0abbfcb6d1042f65c42736a3267bd2e89176f98d
author Andrea Frittoli (andreaf) <andrea.frittoli@hpe.com> Wed Jun 15 23:27:29 2016 +0100
committer Andrea Frittoli (andreaf) <andrea.frittoli@hpe.com> Thu Jun 16 10:32:31 2016 +0100
tree 179c0619515be6c3effe1409f1898984c0bf4aa1
parent 777a307b3c9f4284facf081e6b951b5755333adf

Add operator role to heat stack owner

The account used in SwiftResourcesTestJSON requires the heat stack
owner role along with the swift operator one. No pre-provisioned
account today satisifies that requirement, so fixing that.

Change-Id: I9db0154a364cec3214b5cabd8a7766a110c2b973

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)