65eea0d9c5
The admin credential in [cinder] section is only required in compute nodes while some parameters in the same section like catalog_info is used by both controller nodes and compute nodes. This change makes all credential parameters unset unless the password is given. If the parameters are intentionally set the provided values are honored. Change-Id: I08d787817257d8b2e4a5c1ebf9c6763f6276a7e9
90 lines
4.2 KiB
Ruby
90 lines
4.2 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe 'nova::cinder' do
|
|
|
|
shared_examples 'nova::cinder' do
|
|
context 'with defaults' do
|
|
it 'configures cinder in nova.conf' do
|
|
should contain_nova_config('cinder/password').with_value('<SERVICE DEFAULT>').with_secret(true)
|
|
should contain_nova_config('cinder/auth_type').with_value('<SERVICE DEFAULT>')
|
|
should contain_nova_config('cinder/auth_url').with_value('<SERVICE DEFAULT>')
|
|
should contain_nova_config('cinder/timeout').with_value('<SERVICE DEFAULT>')
|
|
should contain_nova_config('cinder/region_name').with_value('<SERVICE DEFAULT>')
|
|
should contain_nova_config('cinder/project_name').with_value('<SERVICE DEFAULT>')
|
|
should contain_nova_config('cinder/project_domain_name').with_value('<SERVICE DEFAULT>')
|
|
should contain_nova_config('cinder/username').with_value('<SERVICE DEFAULT>')
|
|
should contain_nova_config('cinder/user_domain_name').with_value('<SERVICE DEFAULT>')
|
|
should contain_nova_config('cinder/os_region_name').with_value('<SERVICE DEFAULT>')
|
|
should contain_nova_config('cinder/catalog_info').with_value('<SERVICE DEFAULT>')
|
|
should contain_nova_config('cinder/http_retries').with_value('<SERVICE DEFAULT>')
|
|
end
|
|
end
|
|
|
|
context 'with password' do
|
|
let :params do
|
|
{
|
|
:password => 's3cr3t',
|
|
}
|
|
end
|
|
|
|
it 'configures cinder in nova.conf' do
|
|
should contain_nova_config('cinder/password').with_value('s3cr3t').with_secret(true)
|
|
should contain_nova_config('cinder/auth_type').with_value('password')
|
|
should contain_nova_config('cinder/auth_url').with_value('http://127.0.0.1:5000/')
|
|
should contain_nova_config('cinder/timeout').with_value('<SERVICE DEFAULT>')
|
|
should contain_nova_config('cinder/region_name').with_value('<SERVICE DEFAULT>')
|
|
should contain_nova_config('cinder/project_name').with_value('services')
|
|
should contain_nova_config('cinder/project_domain_name').with_value('Default')
|
|
should contain_nova_config('cinder/username').with_value('cinder')
|
|
should contain_nova_config('cinder/user_domain_name').with_value('Default')
|
|
should contain_nova_config('cinder/os_region_name').with_value('<SERVICE DEFAULT>')
|
|
should contain_nova_config('cinder/catalog_info').with_value('<SERVICE DEFAULT>')
|
|
should contain_nova_config('cinder/http_retries').with_value('<SERVICE DEFAULT>')
|
|
end
|
|
|
|
end
|
|
context 'when specified parameters' do
|
|
let :params do
|
|
{
|
|
:password => 's3cr3t',
|
|
:auth_type => 'v3password',
|
|
:auth_url => 'http://10.0.0.10:5000/v3',
|
|
:timeout => 60,
|
|
:region_name => 'RegionOne',
|
|
:os_region_name => 'RegionOne',
|
|
:catalog_info => 'volumev3:cinderv3:publicURL',
|
|
:http_retries => 3,
|
|
}
|
|
end
|
|
|
|
it 'configures cinder in nova.conf' do
|
|
should contain_nova_config('cinder/password').with_value('s3cr3t').with_secret(true)
|
|
should contain_nova_config('cinder/auth_type').with_value('v3password')
|
|
should contain_nova_config('cinder/auth_url').with_value('http://10.0.0.10:5000/v3')
|
|
should contain_nova_config('cinder/timeout').with_value('60')
|
|
should contain_nova_config('cinder/region_name').with_value('RegionOne')
|
|
should contain_nova_config('cinder/project_name').with_value('services')
|
|
should contain_nova_config('cinder/project_domain_name').with_value('Default')
|
|
should contain_nova_config('cinder/username').with_value('cinder')
|
|
should contain_nova_config('cinder/user_domain_name').with_value('Default')
|
|
should contain_nova_config('cinder/os_region_name').with_value('RegionOne')
|
|
should contain_nova_config('cinder/catalog_info').with_value('volumev3:cinderv3:publicURL')
|
|
should contain_nova_config('cinder/http_retries').with_value(3)
|
|
end
|
|
|
|
end
|
|
end
|
|
|
|
on_supported_os({
|
|
:supported_os => OSDefaults.get_supported_os
|
|
}).each do |os,facts|
|
|
context "on #{os}" do
|
|
let (:facts) do
|
|
facts.merge(OSDefaults.get_facts())
|
|
end
|
|
|
|
it_behaves_like 'nova::cinder'
|
|
end
|
|
end
|
|
end
|