openstack
/
cookbook-openstack-object-storage
Code Issues Proposed changes

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

This commit is contained in:
Jenkins 2015-04-06 15:39:58 +00:00 committed by Gerrit Code Review
parent 14b2ecd6cd bdc7ee1db9
commit 44eea3d1d3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
attributes/default.rb
View File

@ -20,7 +20,7 @@
default['openstack']['object-storage']['service_tenant_name'] = 'service'
default['openstack']['object-storage']['service_user'] = 'swift'
default['openstack']['object-storage']['service_role'] = 'admin'
default['openstack']['object-storage']['service_role'] = 'service'
# Default swift user
default['openstack']['object-storage']['user'] = 'swift'

2
recipes/identity_registration.rb
View File

@ -87,7 +87,7 @@ openstack_identity_register "Register #{service_user} User" do
action :create_user
end
## Grant Admin role to Service User for Service Tenant ##
## Grant Service role to Service User for Service Tenant ##
openstack_identity_register "Grant '#{service_role}' Role to #{service_user} User for #{service_tenant_name} Tenant" do
auth_uri auth_url
bootstrap_token token

6
spec/identity_registration_spec.rb
View File

@ -171,14 +171,14 @@ describe 'openstack-object-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 'admin' Role to swift User for service Tenant"
"Grant 'service' Role to swift User for service Tenant"
).with(
auth_uri: 'http://127.0.0.1:35357/v2.0',
bootstrap_token: 'bootstrap-token',
tenant_name: 'service',
role_name: 'admin',
role_name: 'service',
user_name: 'swift',
action: [:grant_role]
)