openstack/puppet-cinder
Code Issues Proposed changes

Merge "Update tests to leverage rspec-puppet-facts"

Browse Source
This commit is contained in:
Jenkins 2016-01-19 15:07:39 +00:00 committed by Gerrit Code Review
commit 98529f74d6
37 changed files with 441 additions and 507 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

509
spec/classes/cinder_api_spec.rb
View File

@ -2,291 +2,298 @@ require 'spec_helper'
describe 'cinder::api' do
let :req_params do
{:keystone_password => 'foo'}
end
let :facts do
@default_facts.merge({
:osfamily => 'Debian',
:processorcount => 8
})
end
describe 'with only required params' do
let :params do
req_params
shared_examples_for 'cinder api' do
let :req_params do
{:keystone_password => 'foo'}
end
it { is_expected.to contain_service('cinder-api').with(
'hasstatus' => true,
'ensure' => 'running',
'tag' => 'cinder-service',
)}
it 'should configure cinder api correctly' do
is_expected.to contain_cinder_config('DEFAULT/auth_strategy').with(
:value => 'keystone'
)
is_expected.to contain_cinder_config('DEFAULT/osapi_volume_listen').with(
:value => '0.0.0.0'
)
is_expected.to contain_cinder_config('DEFAULT/osapi_volume_workers').with(
:value => '8'
)
is_expected.to contain_cinder_config('DEFAULT/nova_catalog_info').with(
:value => 'compute:Compute Service:publicURL'
)
is_expected.to contain_cinder_config('DEFAULT/nova_catalog_admin_info').with(
:value => 'compute:Compute Service:adminURL'
)
is_expected.to contain_cinder_config('DEFAULT/default_volume_type').with(
:value => '<SERVICE DEFAULT>'
)
is_expected.to contain_cinder_config('DEFAULT/os_region_name').with(
:value => '<SERVICE DEFAULT>'
)
is_expected.to contain_cinder_config('keystone_authtoken/auth_uri').with(
:value => 'http://localhost:5000/'
)
is_expected.to contain_cinder_config('keystone_authtoken/identity_uri').with(
:value => 'http://localhost:35357/'
)
is_expected.to contain_cinder_config('keystone_authtoken/admin_tenant_name').with(
:value => 'services'
)
is_expected.to contain_cinder_config('keystone_authtoken/admin_user').with(
:value => 'cinder'
)
is_expected.to contain_cinder_config('keystone_authtoken/admin_password').with(
:value => 'foo'
)
is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_password').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_tenant').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_auth_url').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('keymgr/encryption_auth_url').with_value('<SERVICE DEFAULT>')
end
end
describe 'with a custom nova_catalog params' do
let :params do
req_params.merge({
'nova_catalog_admin_info' => 'compute:nova:adminURL',
'nova_catalog_info' => 'compute:nova:publicURL',
})
end
it { is_expected.to contain_cinder_config('DEFAULT/nova_catalog_admin_info').with_value('compute:nova:adminURL') }
it { is_expected.to contain_cinder_config('DEFAULT/nova_catalog_info').with_value('compute:nova:publicURL') }
end
describe 'with a custom region for nova' do
let :params do
req_params.merge({'os_region_name' => 'MyRegion'})
end
it 'should configure the region for nova' do
is_expected.to contain_cinder_config('DEFAULT/os_region_name').with(
:value => 'MyRegion'
)
end
end
describe 'with an OpenStack privileged account' do
context 'with all needed params' do
describe 'with only required params' do
let :params do
req_params.merge({
'privileged_user' => 'true',
'os_privileged_user_name' => 'admin',
'os_privileged_user_password' => 'password',
'os_privileged_user_tenant' => 'admin',
'os_privileged_user_auth_url' => 'http://localhost:8080',
})
req_params
end
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_name').with_value('admin') }
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_password').with_value('password') }
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_tenant').with_value('admin') }
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_auth_url').with_value('http://localhost:8080') }
it { is_expected.to contain_service('cinder-api').with(
'hasstatus' => true,
'ensure' => 'running',
'tag' => 'cinder-service',
)}
it 'should configure cinder api correctly' do
is_expected.to contain_cinder_config('DEFAULT/auth_strategy').with(
:value => 'keystone'
)
is_expected.to contain_cinder_config('DEFAULT/osapi_volume_listen').with(
:value => '0.0.0.0'
)
is_expected.to contain_cinder_config('DEFAULT/osapi_volume_workers').with(
:value => '8'
)
is_expected.to contain_cinder_config('DEFAULT/nova_catalog_info').with(
:value => 'compute:Compute Service:publicURL'
)
is_expected.to contain_cinder_config('DEFAULT/nova_catalog_admin_info').with(
:value => 'compute:Compute Service:adminURL'
)
is_expected.to contain_cinder_config('DEFAULT/default_volume_type').with(
:value => '<SERVICE DEFAULT>'
)
is_expected.to contain_cinder_config('DEFAULT/os_region_name').with(
:value => '<SERVICE DEFAULT>'
)
is_expected.to contain_cinder_config('keystone_authtoken/auth_uri').with(
:value => 'http://localhost:5000/'
)
is_expected.to contain_cinder_config('keystone_authtoken/identity_uri').with(
:value => 'http://localhost:35357/'
)
is_expected.to contain_cinder_config('keystone_authtoken/admin_tenant_name').with(
:value => 'services'
)
is_expected.to contain_cinder_config('keystone_authtoken/admin_user').with(
:value => 'cinder'
)
is_expected.to contain_cinder_config('keystone_authtoken/admin_password').with(
:value => 'foo'
)
is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_password').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_tenant').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_auth_url').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('keymgr/encryption_auth_url').with_value('<SERVICE DEFAULT>')
end
end
context 'without os_privileged_user_auth_url' do
describe 'with a custom nova_catalog params' do
let :params do
req_params.merge({
'privileged_user' => 'true',
'os_privileged_user_name' => 'admin',
'os_privileged_user_password' => 'password',
'os_privileged_user_tenant' => 'admin',
'nova_catalog_admin_info' => 'compute:nova:adminURL',
'nova_catalog_info' => 'compute:nova:publicURL',
})
end
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_name').with_value('admin') }
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_password').with_value('password') }
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_tenant').with_value('admin') }
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_auth_url').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_cinder_config('DEFAULT/nova_catalog_admin_info').with_value('compute:nova:adminURL') }
it { is_expected.to contain_cinder_config('DEFAULT/nova_catalog_info').with_value('compute:nova:publicURL') }
end
context 'without os_privileged_user' do
describe 'with a custom region for nova' do
let :params do
req_params.merge({'os_region_name' => 'MyRegion'})
end
it 'should configure the region for nova' do
is_expected.to contain_cinder_config('DEFAULT/os_region_name').with(
:value => 'MyRegion'
)
end
end
describe 'with an OpenStack privileged account' do
context 'with all needed params' do
let :params do
req_params.merge({
'privileged_user' => 'true',
'os_privileged_user_name' => 'admin',
'os_privileged_user_password' => 'password',
'os_privileged_user_tenant' => 'admin',
'os_privileged_user_auth_url' => 'http://localhost:8080',
})
end
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_name').with_value('admin') }
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_password').with_value('password') }
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_tenant').with_value('admin') }
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_auth_url').with_value('http://localhost:8080') }
end
context 'without os_privileged_user_auth_url' do
let :params do
req_params.merge({
'privileged_user' => 'true',
'os_privileged_user_name' => 'admin',
'os_privileged_user_password' => 'password',
'os_privileged_user_tenant' => 'admin',
})
end
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_name').with_value('admin') }
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_password').with_value('password') }
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_tenant').with_value('admin') }
it { is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_auth_url').with_value('<SERVICE DEFAULT>') }
end
context 'without os_privileged_user' do
let :params do
req_params.merge({
'privileged_user' => 'true',
})
end
it_raises 'a Puppet::Error', /The os_privileged_user_name parameter is required when privileged_user is set to true/
end
context 'without os_privileged_user_password' do
let :params do
req_params.merge({
'privileged_user' => 'true',
'os_privileged_user_name' => 'admin',
})
end
it_raises 'a Puppet::Error', /The os_privileged_user_password parameter is required when privileged_user is set to true/
end
context 'without os_privileged_user_tenant' do
let :params do
req_params.merge({
'privileged_user' => 'true',
'os_privileged_user_name' => 'admin',
'os_privileged_user_password' => 'password',
})
end
it_raises 'a Puppet::Error', /The os_privileged_user_tenant parameter is required when privileged_user is set to true/
end
end
describe 'with a default volume type' do
let :params do
req_params.merge({'default_volume_type' => 'foo'})
end
it 'should configure the default volume type for cinder' do
is_expected.to contain_cinder_config('DEFAULT/default_volume_type').with(
:value => 'foo'
)
end
end
describe 'with only required params' do
let :params do
req_params.merge({'bind_host' => '192.168.1.3'})
end
it 'should configure cinder api correctly' do
is_expected.to contain_cinder_config('DEFAULT/osapi_volume_listen').with(
:value => '192.168.1.3'
)
end
end
describe 'with sync_db set to false' do
let :params do
{
:keystone_password => 'dummy',
:enabled => 'true',
:sync_db => false,
}
end
it { is_expected.not_to contain_class('cinder::db::sync') }
end
describe 'with enabled false' do
let :params do
req_params.merge({'enabled' => false})
end
it 'should stop the service' do
is_expected.to contain_service('cinder-api').with_ensure('stopped')
end
it 'includes cinder::db::sync' do
is_expected.to contain_class('cinder::db::sync')
end
end
describe 'with manage_service false' do
let :params do
req_params.merge({'manage_service' => false})
end
it 'should not change the state of the service' do
is_expected.to contain_service('cinder-api').without_ensure
end
it 'includes cinder::db::sync' do
is_expected.to contain_class('cinder::db::sync')
end
end
describe 'with ratelimits' do
let :params do
req_params.merge({ :ratelimits => '(GET, "*", .*, 100, MINUTE);(POST, "*", .*, 200, MINUTE)' })
end
it { is_expected.to contain_cinder_api_paste_ini('filter:ratelimit/limits').with(
:value => '(GET, "*", .*, 100, MINUTE);(POST, "*", .*, 200, MINUTE)'
)}
end
describe 'with encryption_auth_url' do
let :params do
req_params.merge({ :keymgr_encryption_auth_url => 'http://localhost:5000/v3' })
end
it { is_expected.to contain_cinder_config('keymgr/encryption_auth_url').with(
:value => 'http://localhost:5000/v3'
)}
end
describe 'while validating the service with default command' do
let :params do
req_params.merge({
'privileged_user' => 'true',
:validate => true,
})
end
it { is_expected.to contain_exec('execute cinder-api validation').with(
:path => '/usr/bin:/bin:/usr/sbin:/sbin',
:provider => 'shell',
:tries => '10',
:try_sleep => '2',
:command => 'cinder --os-auth-url http://localhost:5000/ --os-tenant-name services --os-username cinder --os-password foo list',
)}
it_raises 'a Puppet::Error', /The os_privileged_user_name parameter is required when privileged_user is set to true/
it { is_expected.to contain_anchor('create cinder-api anchor').with(
:require => 'Exec[execute cinder-api validation]',
)}
end
context 'without os_privileged_user_password' do
describe 'while validating the service with custom command' do
let :params do
req_params.merge({
'privileged_user' => 'true',
'os_privileged_user_name' => 'admin',
:validate => true,
:validation_options => { 'cinder-api' => { 'command' => 'my-script' } }
})
end
it { is_expected.to contain_exec('execute cinder-api validation').with(
:path => '/usr/bin:/bin:/usr/sbin:/sbin',
:provider => 'shell',
:tries => '10',
:try_sleep => '2',
:command => 'my-script',
)}
it_raises 'a Puppet::Error', /The os_privileged_user_password parameter is required when privileged_user is set to true/
it { is_expected.to contain_anchor('create cinder-api anchor').with(
:require => 'Exec[execute cinder-api validation]',
)}
end
context 'without os_privileged_user_tenant' do
describe "with custom keystone identity_uri and auth_uri" do
let :params do
req_params.merge({
'privileged_user' => 'true',
'os_privileged_user_name' => 'admin',
'os_privileged_user_password' => 'password',
:identity_uri => 'https://localhost:35357/',
:auth_uri => 'https://localhost:5000/',
})
end
it_raises 'a Puppet::Error', /The os_privileged_user_tenant parameter is required when privileged_user is set to true/
it 'configures identity_uri and auth_uri but deprecates old auth settings' do
is_expected.to contain_cinder_config('keystone_authtoken/identity_uri').with_value("https://localhost:35357/")
is_expected.to contain_cinder_config('keystone_authtoken/auth_uri').with_value("https://localhost:5000/")
end
end
end
describe 'with a default volume type' do
let :params do
req_params.merge({'default_volume_type' => 'foo'})
end
it 'should configure the default volume type for cinder' do
is_expected.to contain_cinder_config('DEFAULT/default_volume_type').with(
:value => 'foo'
)
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({:processorcount => 8}))
end
it_configures 'cinder api'
end
end
describe 'with only required params' do
let :params do
req_params.merge({'bind_host' => '192.168.1.3'})
end
it 'should configure cinder api correctly' do
is_expected.to contain_cinder_config('DEFAULT/osapi_volume_listen').with(
:value => '192.168.1.3'
)
end
end
describe 'with sync_db set to false' do
let :params do
{
:keystone_password => 'dummy',
:enabled => 'true',
:sync_db => false,
}
end
it { is_expected.not_to contain_class('cinder::db::sync') }
end
describe 'with enabled false' do
let :params do
req_params.merge({'enabled' => false})
end
it 'should stop the service' do
is_expected.to contain_service('cinder-api').with_ensure('stopped')
end
it 'includes cinder::db::sync' do
is_expected.to contain_class('cinder::db::sync')
end
end
describe 'with manage_service false' do
let :params do
req_params.merge({'manage_service' => false})
end
it 'should not change the state of the service' do
is_expected.to contain_service('cinder-api').without_ensure
end
it 'includes cinder::db::sync' do
is_expected.to contain_class('cinder::db::sync')
end
end
describe 'with ratelimits' do
let :params do
req_params.merge({ :ratelimits => '(GET, "*", .*, 100, MINUTE);(POST, "*", .*, 200, MINUTE)' })
end
it { is_expected.to contain_cinder_api_paste_ini('filter:ratelimit/limits').with(
:value => '(GET, "*", .*, 100, MINUTE);(POST, "*", .*, 200, MINUTE)'
)}
end
describe 'with encryption_auth_url' do
let :params do
req_params.merge({ :keymgr_encryption_auth_url => 'http://localhost:5000/v3' })
end
it { is_expected.to contain_cinder_config('keymgr/encryption_auth_url').with(
:value => 'http://localhost:5000/v3'
)}
end
describe 'while validating the service with default command' do
let :params do
req_params.merge({
:validate => true,
})
end
it { is_expected.to contain_exec('execute cinder-api validation').with(
:path => '/usr/bin:/bin:/usr/sbin:/sbin',
:provider => 'shell',
:tries => '10',
:try_sleep => '2',
:command => 'cinder --os-auth-url http://localhost:5000/ --os-tenant-name services --os-username cinder --os-password foo list',
)}
it { is_expected.to contain_anchor('create cinder-api anchor').with(
:require => 'Exec[execute cinder-api validation]',
)}
end
describe 'while validating the service with custom command' do
let :params do
req_params.merge({
:validate => true,
:validation_options => { 'cinder-api' => { 'command' => 'my-script' } }
})
end
it { is_expected.to contain_exec('execute cinder-api validation').with(
:path => '/usr/bin:/bin:/usr/sbin:/sbin',
:provider => 'shell',
:tries => '10',
:try_sleep => '2',
:command => 'my-script',
)}
it { is_expected.to contain_anchor('create cinder-api anchor').with(
:require => 'Exec[execute cinder-api validation]',
)}
end
describe "with custom keystone identity_uri and auth_uri" do
let :params do
req_params.merge({
:identity_uri => 'https://localhost:35357/',
:auth_uri => 'https://localhost:5000/',
})
end
it 'configures identity_uri and auth_uri but deprecates old auth settings' do
is_expected.to contain_cinder_config('keystone_authtoken/identity_uri').with_value("https://localhost:35357/")
is_expected.to contain_cinder_config('keystone_authtoken/auth_uri').with_value("https://localhost:5000/")
end
end
end

22
spec/classes/cinder_backends_spec.rb
View File

@ -62,20 +62,16 @@ describe 'cinder::backends' do
end
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
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_configures 'cinder backends'
end
it_configures 'cinder backends'
end
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
end
it_configures 'cinder backends'
end
end

23
spec/classes/cinder_backup_ceph_spec.rb
View File

@ -70,20 +70,15 @@ describe 'cinder::backup::ceph' do
end
end
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
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_configures 'cinder backup with ceph'
end
it_configures 'cinder backup with ceph'
end
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
end
it_configures 'cinder backup with ceph'
end
end

22
spec/classes/cinder_backup_nfs_spec.rb
View File

@ -67,19 +67,15 @@ describe 'cinder::backup::nfs' do
end
end
context 'on Debian platforms' do
let :facts do
@default_facts.merge({:osfamily => 'Debian'})
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({:processorcount => 8}))
end
it_configures 'cinder backup with nfs'
end
it_configures 'cinder backup with nfs'
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge({:osfamily => 'RedHat'})
end
it_configures 'cinder backup with nfs'
end
end

39
spec/classes/cinder_backup_spec.rb
View File

@ -76,29 +76,24 @@ describe 'cinder::backup' do
end
end
context 'on Debian platforms' do
let :facts do
@default_facts.merge!({ :osfamily => 'Debian' })
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({:processorcount => 8}))
end
let :platform_params do
{ :backup_package => 'cinder-backup',
:backup_service => 'cinder-backup' }
end
let :platform_params do
if facts[:osfamily] == 'Debian'
{ :backup_package => 'cinder-backup',
:backup_service => 'cinder-backup' }
else
{ :backup_service => 'opentack-cinder-backup' }
end
end
it_configures 'cinder backup'
it_configures 'cinder backup'
end
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge!({ :osfamily => 'RedHat' })
end
let :platform_params do
{ :backup_service => 'opentack-cinder-backup' }
end
it_configures 'cinder backup'
end
end

22
spec/classes/cinder_backup_swift_spec.rb
View File

@ -74,20 +74,16 @@ describe 'cinder::backup::swift' do
end
end
context 'on Debian platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'Debian' })
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({:processorcount => 8}))
end
it_configures 'cinder backup with swift'
end
it_configures 'cinder backup with swift'
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'RedHat' })
end
it_configures 'cinder backup with swift'
end
end

22
spec/classes/cinder_client_spec.rb
View File

@ -27,19 +27,15 @@ describe 'cinder::client' do
end
context 'on Debian platform' do
let :facts do
{ :osfamily => 'Debian' }
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({:processorcount => 8}))
end
it_configures 'cinder client'
end
it_configures 'cinder client'
end
context 'on RedHat platform' do
let :facts do
{ :osfamily => 'RedHat' }
end
it_configures 'cinder client'
end
end

14
spec/classes/cinder_db_spec.rb
View File

@ -69,11 +69,11 @@ describe 'cinder::db' do
context 'on Debian platforms' do
let :facts do
@default_facts.merge({
:osfamily => 'Debian',
:operatingsystem => 'Debian',
:operatingsystemrelease => 'jessie',
})
OSDefaults.get_facts({
:osfamily => 'Debian',
:operatingsystem => 'Debian',
:operatingsystemrelease => 'jessie'
})
end
it_configures 'cinder::db'
@ -95,10 +95,10 @@ describe 'cinder::db' do
context 'on Redhat platforms' do
let :facts do
@default_facts.merge({
OSDefaults.get_facts({
:osfamily => 'RedHat',
:operatingsystemrelease => '7.1',
})
})
end
it_configures 'cinder::db'

33
spec/classes/cinder_db_sync_spec.rb
View File

@ -34,30 +34,19 @@ describe 'cinder::db::sync' do
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({
:processorcount => 8,
:concat_basedir => '/var/lib/puppet/concat'
}))
end
context 'on a RedHat osfamily' do
let :facts do
{
:osfamily => 'RedHat',
:operatingsystemrelease => '7.0',
:concat_basedir => '/var/lib/puppet/concat'
}
it_configures 'cinder-dbsync'
end
it_configures 'cinder-dbsync'
end
context 'on a Debian osfamily' do
let :facts do
{
:operatingsystemrelease => '7.8',
:operatingsystem => 'Debian',
:osfamily => 'Debian',
:concat_basedir => '/var/lib/puppet/concat'
}
end
it_configures 'cinder-dbsync'
end
end

22
spec/classes/cinder_glance_spec.rb
View File

@ -66,20 +66,16 @@ describe 'cinder::glance' do
end
end
context 'on Debian platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'Debian' })
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({:processorcount => 8}))
end
it_configures 'cinder with glance'
end
it_configures 'cinder with glance'
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'RedHat' })
end
it_configures 'cinder with glance'
end
end

22
spec/classes/cinder_logging_spec.rb
View File

@ -109,20 +109,16 @@ describe 'cinder::logging' do
end
end
context 'on Debian platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'Debian' })
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({:processorcount => 8}))
end
it_configures 'cinder-logging'
end
it_configures 'cinder-logging'
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'RedHat' })
end
it_configures 'cinder-logging'
end
end

21
spec/classes/cinder_policy_spec.rb
View File

@ -23,19 +23,16 @@ describe 'cinder::policy' do
end
end
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
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({:processorcount => 8}))
end
it_configures 'cinder policies'
it_configures 'cinder policies'
end
end
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
end
it_configures 'cinder policies'
end
end

22
spec/classes/cinder_quota_spec.rb
View File

@ -41,20 +41,16 @@ describe 'cinder::quota' do
end
end
context 'on Debian platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'Debian' })
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({:processorcount => 8}))
end
it_configures 'cinder quota'
end
it_configures 'cinder quota'
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'RedHat' })
end
it_configures 'cinder quota'
end
end

22
spec/classes/cinder_scheduler_filter_spec.rb
View File

@ -46,20 +46,16 @@ describe 'cinder::scheduler::filter' do
end
context 'on Debian platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'Debian' })
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({:processorcount => 8}))
end
it_configures 'cinder scheduler filter'
end
it_configures 'cinder scheduler filter'
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'RedHat' })
end
it_configures 'cinder scheduler filter'
end
end

4
spec/classes/cinder_scheduler_spec.rb
View File

@ -5,7 +5,7 @@ describe 'cinder::scheduler' do
describe 'on debian platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'Debian' })
OSDefaults.get_facts({ :osfamily => 'Debian' })
end
describe 'with default parameters' do
@ -57,7 +57,7 @@ describe 'cinder::scheduler' do
describe 'on rhel platforms' do
let :facts do
{ :osfamily => 'RedHat' }
OSDefaults.get_facts({ :osfamily => 'RedHat' })
end
describe 'with default parameters' do

2
spec/classes/cinder_spec.rb
View File

@ -9,7 +9,7 @@ describe 'cinder' do
end
let :facts do
@default_facts.merge({
OSDefaults.get_facts({
:osfamily => 'Debian',
:operatingsystem => 'Debian',
:operatingsystemrelease => 'jessie',

2
spec/classes/cinder_volume_dellsc_iscsi_spec.rb
View File

@ -23,7 +23,7 @@ describe 'cinder::volume::dellsc_iscsi' do
end
let :facts do
@default_facts.merge({})
OSDefaults.get_facts({})
end
shared_examples_for 'dellsc_iscsi volume driver' do

2
spec/classes/cinder_volume_eqlx_spec.rb
View File

@ -18,7 +18,7 @@ describe 'cinder::volume::eqlx' do
end
let :facts do
@default_facts.merge({})
OSDefaults.get_facts({})
end
describe 'eqlx volume driver' do

22
spec/classes/cinder_volume_glusterfs_spec.rb
View File

@ -40,20 +40,16 @@ describe 'cinder::volume::glusterfs' do
end
end
context 'on Debian platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'Debian' })
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({:processorcount => 8}))
end
it_configures 'glusterfs volume driver'
end
it_configures 'glusterfs volume driver'
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'RedHat' })
end
it_configures 'glusterfs volume driver'
end
end

2
spec/classes/cinder_volume_gpfs_spec.rb
View File

@ -9,7 +9,7 @@ describe 'cinder::volume::gpfs' do
end
let :facts do
@default_facts.merge({})
OSDefaults.get_facts({})
end
context 'gpfs volume driver' do

2
spec/classes/cinder_volume_iscsi_spec.rb
View File

@ -7,7 +7,7 @@ describe 'cinder::volume::iscsi' do
end
let :facts do
@default_facts.merge({:osfamily => 'Debian'})
OSDefaults.get_facts({:osfamily => 'Debian'})
end
describe 'with default params' do

2
spec/classes/cinder_volume_netapp_spec.rb
View File

@ -3,7 +3,7 @@ require 'spec_helper'
describe 'cinder::volume::netapp' do
let :facts do
@default_facts.merge({})
OSDefaults.get_facts({})
end
let :params do

2
spec/classes/cinder_volume_nfs_spec.rb
View File

@ -16,7 +16,7 @@ describe 'cinder::volume::nfs' do
end
let :facts do
@default_facts.merge({})
OSDefaults.get_facts({})
end
describe 'nfs volume driver' do

2
spec/classes/cinder_volume_pure_spec.rb
View File

@ -59,4 +59,4 @@ describe 'cinder::volume::pure' do
end
end
end
end

24
spec/classes/cinder_volume_quobyte_spec.rb
View File

@ -5,7 +5,7 @@ describe 'cinder::volume::quobyte' do
shared_examples_for 'quobyte volume driver' do
let :params do
{
:quobyte_volume_url => 'quobyte://quobyte.cluster.example.com/volume-name',
:quobyte_volume_url => 'quobyte://quobyte.cluster.example.com/volume-name',
:quobyte_qcow2_volumes => false,
:quobyte_sparsed_volumes => true,
}
@ -24,20 +24,16 @@ describe 'cinder::volume::quobyte' do
end
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
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({:processorcount => 8}))
end
it_configures 'quobyte volume driver'
end
it_configures 'quobyte volume driver'
end
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
end
it_configures 'quobyte volume driver'
end
end

2
spec/classes/cinder_volume_rbd_spec.rb
View File

@ -25,7 +25,7 @@ describe 'cinder::volume::rbd' do
end
let :facts do
@default_facts.merge({:osfamily => 'Debian'})
OSDefaults.get_facts({:osfamily => 'Debian'})
end
describe 'rbd volume driver' do

2
spec/classes/cinder_volume_spec.rb
View File

@ -7,7 +7,7 @@ describe 'cinder::volume' do
end
let :facts do
@default_facts.merge({:osfamily => 'Debian'})
OSDefaults.get_facts({:osfamily => 'Debian'})
end
it { is_expected.to contain_package('cinder-volume').with_ensure('present') }

2
spec/classes/cinder_volume_vmdk_spec.rb
View File

@ -3,7 +3,7 @@ require 'spec_helper'
describe 'cinder::volume::vmdk' do
let :facts do
@default_facts.merge({:osfamily => 'Debian'})
OSDefaults.get_facts({:osfamily => 'Debian'})
end
let :params do

2
spec/defines/cinder_backend_dellsc_iscsi_spec.rb
View File

@ -27,7 +27,7 @@ describe 'cinder::backend::dellsc_iscsi' do
end
let :facts do
@default_facts.merge({})
OSDefaults.get_facts({})
end
shared_examples_for 'dellsc_iscsi volume driver' do

25
spec/defines/cinder_backend_glusterfs_spec.rb
View File

@ -6,7 +6,7 @@ describe 'cinder::backend::glusterfs' do
let(:title) {'mygluster'}
let :facts do
@default_facts.merge({})
OSDefaults.get_facts({})
end
let :params do
@ -52,20 +52,15 @@ describe 'cinder::backend::glusterfs' do
end
end
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
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({:processorcount => 8}))
end
it_configures 'glusterfs volume driver'
end
it_configures 'glusterfs volume driver'
end
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
end
it_configures 'glusterfs volume driver'
end
end

2
spec/defines/cinder_backend_gpfs_spec.rb
View File

@ -29,7 +29,7 @@ describe 'cinder::backend::gpfs' do
end
let :facts do
@default_facts.merge({})
OSDefaults.get_facts({})
end
shared_examples_for 'gpfs volume driver' do

2
spec/defines/cinder_backend_iscsi_spec.rb
View File

@ -11,7 +11,7 @@ describe 'cinder::backend::iscsi' do
end
let :facts do
@default_facts.merge({:osfamily => 'Debian'})
OSDefaults.get_facts({:osfamily => 'Debian'})
end
let :params do

2
spec/defines/cinder_backend_netapp_spec.rb
View File

@ -5,7 +5,7 @@ describe 'cinder::backend::netapp' do
let(:title) {'netapp'}
let :facts do
@default_facts.merge({})
OSDefaults.get_facts({})
end
let :params do

2
spec/defines/cinder_backend_pure_spec.rb
View File

@ -67,4 +67,4 @@ describe 'cinder::backend::pure' do
end
end
end
end

22
spec/defines/cinder_backend_quobyte_spec.rb
View File

@ -26,20 +26,16 @@ describe 'cinder::backend::quobyte' do
end
context 'on Debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
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({:processorcount => 8}))
end
it_configures 'quobyte volume driver'
end
it_configures 'quobyte volume driver'
end
context 'on RedHat platforms' do
let :facts do
{ :osfamily => 'RedHat' }
end
it_configures 'quobyte volume driver'
end
end

2
spec/defines/cinder_backend_rbd_spec.rb
View File

@ -5,7 +5,7 @@ describe 'cinder::backend::rbd' do
let(:title) {'rbd-ssd'}
let :facts do
@default_facts.merge({})
OSDefaults.get_facts({})
end
let :req_params do

2
spec/defines/cinder_backend_vmdk_spec.rb
View File

@ -5,7 +5,7 @@ describe 'cinder::backend::vmdk' do
let(:title) { 'hippo' }
let :facts do
@default_facts.merge({})
OSDefaults.get_facts({})
end
let :params do