Merge "Use new "service" role instead of "admin""

This commit is contained in:
Jenkins 2015-04-06 16:13:26 +00:00 committed by Gerrit Code Review
commit 440f32f4fb
2 changed files with 3 additions and 3 deletions

View File

@ -128,7 +128,7 @@ end
default['openstack']['block-storage']['service_tenant_name'] = 'service'
default['openstack']['block-storage']['service_user'] = 'cinder'
default['openstack']['block-storage']['service_role'] = 'admin'
default['openstack']['block-storage']['service_role'] = 'service'
# SAN Support
default['openstack']['block-storage']['san']['san_ip'] = '127.0.0.1'

View File

@ -173,7 +173,7 @@ describe 'openstack-block-storage::identity_registration' do
)
end
it 'grants admin role to service user for service tenant' do
it 'grants service role to service user for service tenant' do
expect(chef_run).to grant_role_openstack_identity_register(
'Grant service Role to Cinder Service User for Cinder Service Tenant'
).with(
@ -181,7 +181,7 @@ describe 'openstack-block-storage::identity_registration' do
bootstrap_token: 'bootstrap-token',
tenant_name: 'service',
user_name: 'cinder',
role_name: 'admin'
role_name: 'service'
)
end
end