openstack
/
cookbook-openstack-network
Code Issues Proposed changes

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

This commit is contained in:
Jenkins 2015-04-06 16:02:12 +00:00 committed by Gerrit Code Review
parent 23eeca48e1 c80a7b3045
commit 3babcc56c9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
attributes/default.rb
View File

@ -52,7 +52,7 @@ default['openstack']['network']['rabbit_server_chef_role'] = 'rabbitmq-server'
# Used in the Keystone authtoken middleware configuration
default['openstack']['network']['service_tenant_name'] = 'service'
default['openstack']['network']['service_user'] = 'neutron'
default['openstack']['network']['service_role'] = 'admin'
default['openstack']['network']['service_role'] = 'service'
# Number of separate worker processes to spawn. The default, 0, runs the
# worker thread in the current process. Greater than 0 launches that number of

6
spec/identity_registration_spec.rb
View File

@ -163,14 +163,14 @@ describe 'openstack-network::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 neutron User for service Tenant"
"Grant 'service' Role to neutron 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: 'neutron'
)
end