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

attributes/default.rb

@@ -41,7 +41,7 @@ default['openstack']['image']['rabbit_server_chef_role'] = 'os-ops-messaging'
 
 default['openstack']['image']['service_tenant_name'] = 'service'
 default['openstack']['image']['service_user'] = 'glance'
-default['openstack']['image']['service_role'] = 'admin'
+default['openstack']['image']['service_role'] = 'service'
 
 default['openstack']['image']['notification_driver'] = 'noop'
 

recipes/identity_registration.rb

@@ -89,7 +89,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

spec/identity_registration_spec.rb

@@ -179,17 +179,17 @@ describe 'openstack-image::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
     resource = chef_run.find_resource(
       'openstack-identity_register',
-      "Grant 'admin' Role to glance User for service Tenant"
+      "Grant 'service' Role to glance User for service Tenant"
     ).to_hash
 
     expect(resource).to include(
       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: 'glance',
       action: [:grant_role]
     )