openstack
/
tempest
Code Issues Proposed changes

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
This commit is contained in:
Andrea Frittoli (andreaf) 2016-06-15 23:27:29 +01:00
parent 777a307b3c
commit 0abbfcb6d1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tempest/cmd/account_generator.py
View File

@ -157,7 +157,8 @@ def generate_resources(cred_provider, admin):
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 = []

2
tempest/tests/cmd/test_account_generator.py
View File

@ -234,7 +234,7 @@ class TestGenerateResourcesV2(base.TestCase, MockHelpersMixin):
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)