From c80a7b3045e1a1fbf5936c8427a65e034b5ca410 Mon Sep 17 00:00:00 2001 From: Mark Vanderwiel Date: Tue, 24 Mar 2015 15:45:15 -0500 Subject: [PATCH] Use new "service" role instead of "admin" Change-Id: I410f260b6d522b8d28817f91f6103ab989859b0e Partial-Bug: #1436050 --- attributes/default.rb | 2 +- spec/identity_registration_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 74411283..e2e4fb10 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -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 diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb index cad8aef1..71dea3ce 100644 --- a/spec/identity_registration_spec.rb +++ b/spec/identity_registration_spec.rb @@ -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