Revert "Use new "service" role instead of "admin""
This reverts commit de410e11fb
.
Closes-bug: #1450473
Change-Id: Id81eca2dca6cf418086483662cb49204c3129fce
This commit is contained in:
parent
8d3f085f46
commit
0cea7f1ac6
|
@ -4,3 +4,5 @@ metadata
|
|||
|
||||
cookbook "openstack-common",
|
||||
github: "stackforge/cookbook-openstack-common"
|
||||
cookbook 'openstack-identity',
|
||||
github: 'stackforge/cookbook-openstack-identity'
|
||||
|
|
|
@ -64,7 +64,7 @@ default['openstack']['bare-metal']['api']['auth']['cache_dir'] = '/var/cache/iro
|
|||
|
||||
default['openstack']['bare-metal']['service_tenant_name'] = 'service'
|
||||
default['openstack']['bare-metal']['service_user'] = 'ironic'
|
||||
default['openstack']['bare-metal']['service_role'] = 'service'
|
||||
default['openstack']['bare-metal']['service_role'] = 'admin'
|
||||
|
||||
default['openstack']['bare-metal']['user'] = 'ironic'
|
||||
default['openstack']['bare-metal']['group'] = 'ironic'
|
||||
|
|
|
@ -13,3 +13,4 @@ recipe 'openstack-bare-metal::identity_registration', 'Registers ironi
|
|||
recipe 'openstack-bare-metal::ironic-common', 'Defines the common pieces of repeated code from the other recipes'
|
||||
|
||||
depends 'openstack-common', '>= 11.0.0'
|
||||
depends 'openstack-identity', '>= 11.0.0'
|
||||
|
|
|
@ -75,7 +75,7 @@ openstack_identity_register 'Register Ironic bare metal Service User' do
|
|||
action :create_user
|
||||
end
|
||||
|
||||
openstack_identity_register 'Grant service Role to Ironic Service User for Ironic Service Tenant' do
|
||||
openstack_identity_register 'Grant admin Role to Ironic Service User for Ironic Service Tenant' do
|
||||
auth_uri auth_uri
|
||||
bootstrap_token bootstrap_token
|
||||
tenant_name service_tenant_name
|
||||
|
|
|
@ -0,0 +1,74 @@
|
|||
# encoding: UTF-8
|
||||
|
||||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-bare-metal::identity_registration' do
|
||||
describe 'ubuntu' do
|
||||
let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
|
||||
let(:node) { runner.node }
|
||||
let(:chef_run) { runner.converge(described_recipe) }
|
||||
|
||||
include_context 'bare-metal-stubs'
|
||||
|
||||
it 'registers service tenant' do
|
||||
expect(chef_run).to create_tenant_openstack_identity_register(
|
||||
'Register Service Tenant'
|
||||
).with(
|
||||
auth_uri: 'http://127.0.0.1:35357/v2.0',
|
||||
bootstrap_token: 'bootstrap-token',
|
||||
tenant_name: 'service',
|
||||
tenant_description: 'Service Tenant'
|
||||
)
|
||||
end
|
||||
|
||||
it 'registers bare metal service' do
|
||||
expect(chef_run).to create_service_openstack_identity_register(
|
||||
'Register Ironic bare metal Service'
|
||||
).with(
|
||||
auth_uri: 'http://127.0.0.1:35357/v2.0',
|
||||
bootstrap_token: 'bootstrap-token',
|
||||
service_name: 'ironic',
|
||||
service_type: 'baremetal',
|
||||
service_description: 'Ironic bare metal provisioning service'
|
||||
)
|
||||
end
|
||||
|
||||
it 'registers bare metal endpoint' do
|
||||
expect(chef_run).to create_endpoint_openstack_identity_register(
|
||||
'Register Ironic bare metal Endpoint'
|
||||
).with(
|
||||
auth_uri: 'http://127.0.0.1:35357/v2.0',
|
||||
bootstrap_token: 'bootstrap-token',
|
||||
service_type: 'baremetal',
|
||||
endpoint_region: 'RegionOne',
|
||||
endpoint_adminurl: 'http://127.0.0.1:6385',
|
||||
endpoint_internalurl: 'http://127.0.0.1:6385',
|
||||
endpoint_publicurl: 'http://127.0.0.1:6385'
|
||||
)
|
||||
end
|
||||
|
||||
it 'registers bare metal service user' do
|
||||
expect(chef_run).to create_user_openstack_identity_register(
|
||||
'Register Ironic bare metal Service User'
|
||||
).with(
|
||||
auth_uri: 'http://127.0.0.1:35357/v2.0',
|
||||
bootstrap_token: 'bootstrap-token',
|
||||
tenant_name: 'service',
|
||||
user_name: 'ironic',
|
||||
user_pass: 'service_pass'
|
||||
)
|
||||
end
|
||||
|
||||
it 'grants admin role to service user for service tenant' do
|
||||
expect(chef_run).to grant_role_openstack_identity_register(
|
||||
'Grant admin Role to Ironic Service User for Ironic Service Tenant'
|
||||
).with(
|
||||
auth_uri: 'http://127.0.0.1:35357/v2.0',
|
||||
bootstrap_token: 'bootstrap-token',
|
||||
tenant_name: 'service',
|
||||
role_name: 'admin',
|
||||
user_name: 'ironic'
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue