
This change updates the manila::keystone::auth class to include a default service_name of 'manila' so that if a user changes the auth_name, the service is still created as being related to 'manila'. This improves the user experiance when they want to customize the usernames for services. Change-Id: I8c6240473213b107de862edf359834b5494e9f74 Closes-Bug: #1590040
114 lines
4.0 KiB
Ruby
114 lines
4.0 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe 'manila::keystone::auth' do
|
|
|
|
let :params do
|
|
{:password => 'pw',
|
|
:password_v2 => 'pw2'}
|
|
end
|
|
|
|
describe 'with only required params' do
|
|
|
|
it 'should contain auth info' do
|
|
|
|
is_expected.to contain_keystone_user('manila').with(
|
|
:ensure => 'present',
|
|
:password => 'pw',
|
|
:email => 'manila@localhost',
|
|
)
|
|
is_expected.to contain_keystone_user_role('manila@services').with(
|
|
:ensure => 'present',
|
|
:roles => ['admin']
|
|
)
|
|
is_expected.to contain_keystone_service('manila::share').with(
|
|
:ensure => 'present',
|
|
:description => 'Manila Service'
|
|
)
|
|
|
|
is_expected.to contain_keystone_user('manilav2').with(
|
|
:ensure => 'present',
|
|
:password => 'pw2',
|
|
:email => 'manilav2@localhost',
|
|
)
|
|
is_expected.to contain_keystone_user_role('manilav2@services').with(
|
|
:ensure => 'present',
|
|
:roles => ['admin']
|
|
)
|
|
is_expected.to contain_keystone_service('manilav2::sharev2').with(
|
|
:ensure => 'present',
|
|
:description => 'Manila Service v2'
|
|
)
|
|
|
|
end
|
|
it { is_expected.to contain_keystone_endpoint('RegionOne/manila::share').with(
|
|
:ensure => 'present',
|
|
:public_url => 'http://127.0.0.1:8786/v1/%(tenant_id)s',
|
|
:admin_url => 'http://127.0.0.1:8786/v1/%(tenant_id)s',
|
|
:internal_url => 'http://127.0.0.1:8786/v1/%(tenant_id)s'
|
|
) }
|
|
it { is_expected.to contain_keystone_endpoint('RegionOne/manilav2::sharev2').with(
|
|
:ensure => 'present',
|
|
:public_url => 'http://127.0.0.1:8786/v2/%(tenant_id)s',
|
|
:admin_url => 'http://127.0.0.1:8786/v2/%(tenant_id)s',
|
|
:internal_url => 'http://127.0.0.1:8786/v2/%(tenant_id)s'
|
|
) }
|
|
|
|
end
|
|
|
|
context 'when overriding endpoint parameters' do
|
|
before do
|
|
params.merge!(
|
|
:region => 'RegionThree',
|
|
:public_url => 'https://10.0.42.1:4242/v42/%(tenant_id)s',
|
|
:admin_url => 'https://10.0.42.2:4242/v42/%(tenant_id)s',
|
|
:internal_url => 'https://10.0.42.3:4242/v42/%(tenant_id)s',
|
|
:public_url_v2 => 'https://10.0.42.1:4242/v43/%(tenant_id)s',
|
|
:admin_url_v2 => 'https://10.0.42.2:4242/v43/%(tenant_id)s',
|
|
:internal_url_v2 => 'https://10.0.42.3:4242/v43/%(tenant_id)s'
|
|
)
|
|
end
|
|
|
|
it { is_expected.to contain_keystone_endpoint('RegionThree/manila::share').with(
|
|
:ensure => 'present',
|
|
:public_url => 'https://10.0.42.1:4242/v42/%(tenant_id)s',
|
|
:admin_url => 'https://10.0.42.2:4242/v42/%(tenant_id)s',
|
|
:internal_url => 'https://10.0.42.3:4242/v42/%(tenant_id)s'
|
|
)}
|
|
it { is_expected.to contain_keystone_endpoint('RegionThree/manilav2::sharev2').with(
|
|
:ensure => 'present',
|
|
:public_url => 'https://10.0.42.1:4242/v43/%(tenant_id)s',
|
|
:admin_url => 'https://10.0.42.2:4242/v43/%(tenant_id)s',
|
|
:internal_url => 'https://10.0.42.3:4242/v43/%(tenant_id)s'
|
|
)}
|
|
end
|
|
|
|
describe 'when endpoint should not be configured' do
|
|
before do
|
|
params.merge!(
|
|
:configure_endpoint => false,
|
|
:configure_endpoint_v2 => false
|
|
)
|
|
end
|
|
it { is_expected.to_not contain_keystone_endpoint('RegionOne/manila::share') }
|
|
it { is_expected.to_not contain_keystone_endpoint('RegionOne/manilav2::sharev2') }
|
|
end
|
|
|
|
describe 'when overriding service names' do
|
|
|
|
before do
|
|
params.merge!(
|
|
:service_name => 'manila_service',
|
|
:service_name_v2 => 'manila_service_v2',
|
|
)
|
|
end
|
|
|
|
it { is_expected.to contain_keystone_user('manila') }
|
|
it { is_expected.to contain_keystone_user_role('manila@services') }
|
|
it { is_expected.to contain_keystone_service('manila_service::share') }
|
|
it { is_expected.to contain_keystone_service('manila_service_v2::sharev2') }
|
|
it { is_expected.to contain_keystone_endpoint('RegionOne/manila_service::share') }
|
|
it { is_expected.to contain_keystone_endpoint('RegionOne/manila_service_v2::sharev2') }
|
|
|
|
end
|
|
end
|