openstack
/
cookbook-openstack-orchestration
Code Issues Proposed changes

Use new "service" role instead of "admin" 

Partial-Bug: #1436050

Change-Id: Ib2d20e95ad44a61f6d68ecd0726b9f29cc0bc595
This commit is contained in:
Mark Vanderwiel 2015-03-24 15:48:04 -05:00
parent 075c0f5529
commit c8f98f0655
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

@ -38,7 +38,7 @@ default['openstack']['orchestration']['rabbit_server_chef_role'] = 'os-ops-messa
default['openstack']['orchestration']['service_tenant_name'] = 'service'
default['openstack']['orchestration']['service_user'] = 'heat'
default['openstack']['orchestration']['service_role'] = 'admin'
default['openstack']['orchestration']['service_role'] = 'service'
default['openstack']['orchestration']['api']['auth']['version'] = node['openstack']['api']['auth']['version']

2
recipes/identity_registration.rb
View File

@ -123,7 +123,7 @@ openstack_identity_register 'Register Heat Service 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

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