
This change deprecates the following parameters: - version (replaced by public/internal/admin_url) - port (replaced by public/internal/admin_url) - public_protocol (replaced by public_url) - public_address (replaced by public_url) - internal_protocol (replaced by internal_url) - internal_address (replaced by internal_url) - admin_protocol (replaced by admin_url) - admin_address (replaced by admin_url) Add deprecation warnings if any of those values are provided while maintaining full backward compatibility. Closes-bug: #1274979 Change-Id: I52ed1e7bd9315bfc3b4d4b331ff8c4006654ea3c
221 lines
6.6 KiB
Ruby
221 lines
6.6 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe 'heat::keystone::auth' do
|
|
|
|
let :params do
|
|
{:password => 'heat-passw0rd'}
|
|
end
|
|
|
|
shared_examples_for 'heat keystone auth' do
|
|
|
|
context 'without the required password parameter' do
|
|
before { params.delete(:password) }
|
|
it { expect { is_expected.to raise_error(Puppet::Error) } }
|
|
end
|
|
|
|
context 'with service disabled' do
|
|
before do
|
|
params.merge!({:configure_service => false})
|
|
end
|
|
it { is_expected.to_not contain_keystone_service('RegionOne/heat') }
|
|
end
|
|
|
|
context 'with overridden parameters' do
|
|
before do
|
|
params.merge!({
|
|
:password => 'heat-passw0rd',
|
|
:email => 'heat@localhost',
|
|
:auth_name => 'heat',
|
|
:configure_endpoint => true,
|
|
:service_type => 'orchestration',
|
|
:region => 'RegionOne',
|
|
:tenant => 'services',
|
|
:public_url => 'http://127.0.0.1:8004/v1/%(tenant_id)s',
|
|
:admin_url => 'http://127.0.0.1:8004/v1/%(tenant_id)s',
|
|
:internal_url => 'http://127.0.0.1:8004/v1/%(tenant_id)s',
|
|
:configure_delegated_roles => false,
|
|
})
|
|
end
|
|
|
|
it 'configures heat user' do
|
|
is_expected.to contain_keystone_user( params[:auth_name] ).with(
|
|
:ensure => 'present',
|
|
:password => params[:password],
|
|
:email => params[:email],
|
|
:tenant => params[:tenant]
|
|
)
|
|
end
|
|
|
|
it 'configures heat user roles' do
|
|
is_expected.to contain_keystone_user_role("#{params[:auth_name]}@#{params[:tenant]}").with(
|
|
:ensure => 'present',
|
|
:roles => ['admin']
|
|
)
|
|
end
|
|
|
|
it 'configures heat stack_user role' do
|
|
is_expected.to contain_keystone_role("heat_stack_user").with(
|
|
:ensure => 'present'
|
|
)
|
|
end
|
|
|
|
|
|
it 'configures heat service' do
|
|
is_expected.to contain_keystone_service( params[:auth_name] ).with(
|
|
:ensure => 'present',
|
|
:type => params[:service_type],
|
|
:description => 'Openstack Orchestration Service'
|
|
)
|
|
end
|
|
|
|
it 'configure heat endpoints' do
|
|
is_expected.to contain_keystone_endpoint("#{params[:region]}/#{params[:auth_name]}").with(
|
|
:ensure => 'present',
|
|
:public_url => params[:public_url],
|
|
:admin_url => params[:admin_url],
|
|
:internal_url => params[:internal_url]
|
|
)
|
|
end
|
|
end
|
|
|
|
context 'with deprecated endpoint parameters' do
|
|
before do
|
|
params.merge!({
|
|
:public_protocol => 'https',
|
|
:public_address => '10.10.10.10',
|
|
:port => '81',
|
|
:version => 'v2',
|
|
:internal_protocol => 'http',
|
|
:internal_address => '10.10.10.11',
|
|
:admin_protocol => 'http',
|
|
:admin_address => '10.10.10.12'
|
|
})
|
|
end
|
|
|
|
it { is_expected.to contain_keystone_endpoint('RegionOne/heat').with(
|
|
:ensure => 'present',
|
|
:public_url => "#{params[:public_protocol]}://#{params[:public_address]}:#{params[:port]}/#{params[:version]}/%(tenant_id)s",
|
|
:admin_url => "#{params[:admin_protocol]}://#{params[:admin_address]}:#{params[:port]}/#{params[:version]}/%(tenant_id)s",
|
|
:internal_url => "#{params[:internal_protocol]}://#{params[:internal_address]}:#{params[:port]}/#{params[:version]}/%(tenant_id)s"
|
|
) }
|
|
end
|
|
|
|
context 'when overriding service name' do
|
|
before do
|
|
params.merge!({
|
|
:service_name => 'heat_service'
|
|
})
|
|
end
|
|
it 'configures correct user name' do
|
|
is_expected.to contain_keystone_user('heat')
|
|
end
|
|
it 'configures correct user role' do
|
|
is_expected.to contain_keystone_user_role('heat@services')
|
|
end
|
|
it 'configures correct service name' do
|
|
is_expected.to contain_keystone_service('heat_service')
|
|
end
|
|
it 'configures correct endpoint name' do
|
|
is_expected.to contain_keystone_endpoint('RegionOne/heat_service')
|
|
end
|
|
end
|
|
|
|
context 'when disabling user configuration' do
|
|
before do
|
|
params.merge!( :configure_user => false )
|
|
end
|
|
|
|
it { is_expected.to_not contain_keystone_user('heat') }
|
|
it { is_expected.to contain_keystone_user_role('heat@services') }
|
|
|
|
it { is_expected.to contain_keystone_service('heat').with(
|
|
:ensure => 'present',
|
|
:type => 'orchestration',
|
|
:description => 'Openstack Orchestration Service'
|
|
)}
|
|
end
|
|
|
|
context 'when disabling user and role configuration' do
|
|
before do
|
|
params.merge!(
|
|
:configure_user => false,
|
|
:configure_user_role => false
|
|
)
|
|
end
|
|
|
|
it { is_expected.to_not contain_keystone_user('heat') }
|
|
it { is_expected.to_not contain_keystone_user_role('heat@services') }
|
|
|
|
it { is_expected.to contain_keystone_service('heat').with(
|
|
:ensure => 'present',
|
|
:type => 'orchestration',
|
|
:description => 'Openstack Orchestration Service'
|
|
)}
|
|
end
|
|
|
|
context 'when configuring delegated roles' do
|
|
let :pre_condition do
|
|
"class { 'heat::engine':
|
|
auth_encryption_key => '1234567890AZERTYUIOPMLKJHGFDSQ12',
|
|
configure_delegated_roles => false,
|
|
}
|
|
"
|
|
end
|
|
|
|
let :facts do
|
|
{ :osfamily => 'Debian' }
|
|
end
|
|
|
|
before do
|
|
params.merge!({
|
|
:configure_delegated_roles => true,
|
|
})
|
|
end
|
|
it 'configures delegated roles' do
|
|
is_expected.to contain_keystone_role("heat_stack_owner").with(
|
|
:ensure => 'present'
|
|
)
|
|
end
|
|
end
|
|
|
|
describe 'with deprecated and new params both set' do
|
|
let :pre_condition do
|
|
"class { 'heat::engine':
|
|
auth_encryption_key => '1234567890AZERTYUIOPMLKJHGFDSQ12',
|
|
}
|
|
"
|
|
end
|
|
|
|
let :facts do
|
|
{ :osfamily => 'Debian' }
|
|
end
|
|
|
|
let :params do
|
|
{
|
|
:configure_delegated_roles => true,
|
|
:password => 'something',
|
|
}
|
|
end
|
|
it_raises 'a Puppet::Error', /both heat::engine and heat::keystone::auth are both trying to configure delegated roles/
|
|
|
|
end
|
|
|
|
end
|
|
|
|
context 'on Debian platforms' do
|
|
let :facts do
|
|
{ :osfamily => 'Debian' }
|
|
end
|
|
|
|
it_configures 'heat keystone auth'
|
|
end
|
|
|
|
context 'on RedHat platforms' do
|
|
let :facts do
|
|
{ :osfamily => 'RedHat' }
|
|
end
|
|
|
|
it_configures 'heat keystone auth'
|
|
end
|
|
end
|