openstack
/
fuel-library
Code Issues Proposed changes

Fix noop tests for Fuel-10.0 

We have some outdated and broken tests that needs to be fixed
before we can update astute.yaml fixtures to 10.0.

Change-Id: I49321305a81fbc99fa4265cc5836fadb952f997e
Fuel-CI: disable
Partial-bug: #1535339
This commit is contained in:
Aleksandr Didenko 2016-05-30 12:33:40 +02:00
parent 0c83e60d9a
commit e92fa6ac9b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/noop/spec/hosts/roles/cinder_spec.rb
View File

@ -28,6 +28,7 @@ describe manifest do
cinder_db_user = Noop.hiera_structure 'cinder/db_user', 'cinder'
cinder_db_name = Noop.hiera_structure 'cinder/db_name', 'cinder'
cinder = Noop.puppet_function 'roles_include', 'cinder'
cinder_block_device = Noop.puppet_function 'roles_include', 'cinder-block-device'
hostname = Noop.hiera('fqdn')
let(:manage_volumes) do
@ -76,7 +77,7 @@ describe manifest do
should contain_cinder_config('DEFAULT/use_stderr').with(:value => 'false')
end
if storage_hash['volumes_block_device']
if storage_hash['volumes_block_device'] and cinder_block_device
disks_metadata = Noop.hiera('node_volumes')
let (:disks_list) do
@ -93,7 +94,7 @@ describe manifest do
should contain_cinder_config('BDD-backend/iscsi_ip_address').with(:value => iscsi_bind_host)
should contain_cinder_config('BDD-backend/volume_group').with(:value => 'cinder')
should contain_cinder_config('BDD-backend/volumes_dir').with(:value => '/var/lib/cinder/volumes')
should contain_cinder_config('BDD-backend/available_devices').with(:value => disks_list)
should contain_cinder_config('BDD-backend/available_devices').with(:value => disks_list.join(','))
end
end