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

This reverts commit 5388baa0a1.

Closes-Bug: #1447940
Change-Id: I333a731f6bc169b46b86fded1572baca1516ce8f
This commit is contained in:
Chen Zhiwei 2015-04-23 16:50:11 +08:00
parent 668203d263
commit fca4820bff
3 changed files with 6 additions and 6 deletions

View File

@ -58,7 +58,7 @@ default['openstack']['telemetry']['group'] = 'ceilometer'
default['openstack']['telemetry']['region'] = node['openstack']['region']
default['openstack']['telemetry']['service_user'] = 'ceilometer'
default['openstack']['telemetry']['service_tenant_name'] = 'service'
default['openstack']['telemetry']['service_role'] = 'service'
default['openstack']['telemetry']['service_role'] = 'admin'
# A PEM encoded Certificate Authority to use when verifying HTTPs connections (for service polling authentication)
default['openstack']['telemetry']['service-credentials']['cafile'] = nil

View File

@ -56,8 +56,8 @@ openstack_identity_register 'Register Service User' do
action :create_user
end
# Grant Service role to Service User for Service Tenant
openstack_identity_register "Grant 'service' Role to Service User for Service Tenant" do
# Grant Admin role to Service User for Service Tenant
openstack_identity_register "Grant 'admin' Role to Service User for Service Tenant" do
auth_uri auth_uri
bootstrap_token bootstrap_token
tenant_name service_tenant_name

View File

@ -33,15 +33,15 @@ describe 'openstack-telemetry::identity_registration' do
)
end
it 'grants service role to service user for service tenant' do
it 'grants admin role to service user for service tenant' do
expect(chef_run).to grant_role_openstack_identity_register(
"Grant 'service' Role to Service User for Service Tenant"
"Grant 'admin' Role to Service User for Service Tenant"
).with(
auth_uri: 'http://127.0.0.1:35357/v2.0',
bootstrap_token: 'bootstrap-token',
tenant_name: 'service',
user_name: 'ceilometer',
role_name: 'service'
role_name: 'admin'
)
end