add basic scenarios options

add img_dir and img_file which are the basic scenario options.

Change-Id: I8361d859e1c6bd2ef15446518e2ffb442a5d2edb
This commit is contained in:
Emilien Macchi 2015-08-28 16:55:12 -04:00
parent ce8936d8a6
commit 01e1fd4955
2 changed files with 11 additions and 0 deletions
manifests
spec/classes

@ -117,6 +117,10 @@
# Defaults to true
# [*auth_version*]
# Defaults to 'v2'
# [*img_dir*]
# Defaults to '/var/lib/tempest'
# [*img_file*]
# Defaults to 'cirros-0.3.4-x86_64-disk.img'
#
class tempest(
$install_from_source = true,
@ -197,6 +201,9 @@ class tempest(
$keystone_v2 = true,
$keystone_v3 = true,
$auth_version = 'v2',
# scenario options
$img_dir = '/var/lib/tempest',
$img_file = 'cirros-0.3.4-x86_64-disk.img',
) {
include '::tempest::params'
@ -304,6 +311,8 @@ class tempest(
'DEFAULT/use_stderr': value => $use_stderr;
'DEFAULT/use_syslog': value => $use_syslog;
'DEFAULT/log_file': value => $log_file;
'scenario/img_dir': value => $img_dir;
'scenario/img_file': value => $img_file;
}
if $configure_images {

@ -195,6 +195,8 @@ describe 'tempest' do
is_expected.to contain_tempest_config('DEFAULT/use_stderr').with(:value => true)
is_expected.to contain_tempest_config('DEFAULT/use_syslog').with(:value => false)
is_expected.to contain_tempest_config('DEFAULT/log_file').with(:value => nil)
is_expected.to contain_tempest_config('scenario/img_dir').with(:value => '/var/lib/tempest')
is_expected.to contain_tempest_config('scenario/img_file').with(:value => 'cirros-0.3.4-x86_64-disk.img')
end
it 'set glance id' do