openstack
/
puppet-tempest
Code Issues Proposed changes

Fix group name of the image_ssh_user option 

Option "image_ssh_user" from group "compute" is deprecated.
Use option "image_ssh_user" from group "validation".

Change-Id: If12caf3606a23f79fd92d58f8d391c773cb2abf2
Closes-Bug: #1638197
This commit is contained in:
ZhongShengping 2016-11-01 15:39:56 +08:00
parent df0ddad85e
commit fa4bf27d68
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -429,9 +429,9 @@ class tempest(
'compute/image_alt_ssh_user': value => $image_alt_ssh_user;
'compute/image_ref': value => $image_ref;
'compute/image_ref_alt': value => $image_ref_alt;
'compute/image_ssh_user': value => $image_ssh_user;
'compute/resize_available': value => $resize_available;
'compute/build_interval': value => $compute_build_interval;
'validation/image_ssh_user': value => $image_ssh_user;
'identity/admin_role': value => $admin_role;
'identity/alt_password': value => $alt_password, secret => true;
'identity/alt_project_name': value => $alt_project_name_real;

30
spec/classes/tempest_spec.rb → spec/classes/tempest_init_spec.rb
View File

@ -26,8 +26,8 @@ describe 'tempest' do
context 'with image_ref parameters' do
let :params do
{ :image_ref => '4c423fc6-87f7-4e6d-9d3c-abc13058ae5b',
:image_ref_alt => '4c423fc6-87f7-4e6d-9d3c-abc13058ae5b' }
{ :image_ref => '4c423fc6-87f7-4e6d-9d3c-abc13058ae5b',
:image_ref_alt => '4c423fc6-87f7-4e6d-9d3c-abc13058ae5b' }
end
it 'configures image_ref' do
@ -37,8 +37,8 @@ describe 'tempest' do
context 'with image_name' do
let :params do
{ :image_name => 'cirros',
:image_name_alt => 'cirros' }
{ :image_name => 'cirros',
:image_name_alt => 'cirros' }
end
it 'uses a resource to configure image_ref from image_name' do
@ -48,10 +48,10 @@ describe 'tempest' do
context 'with image_ref and image_name parameters' do
let :params do
{ :image_name => 'cirros',
:image_name_alt => 'cirros',
:image_ref => '4c423fc6-87f7-4e6d-9d3c-abc13058ae5b',
:image_ref_alt => '4c423fc6-87f7-4e6d-9d3c-abc13058ae5b' }
{ :image_name => 'cirros',
:image_name_alt => 'cirros',
:image_ref => '4c423fc6-87f7-4e6d-9d3c-abc13058ae5b',
:image_ref_alt => '4c423fc6-87f7-4e6d-9d3c-abc13058ae5b' }
end
it_raises 'a Puppet::Error', /either image_name or image_ref/
@ -135,10 +135,10 @@ describe 'tempest' do
it 'creates ec2 credentials' do
is_expected.to contain_tempest_ec2_credentials('ec2_test_creds').with(
:ensure => 'present',
:tempest_conf_path => '/var/lib/tempest/etc/tempest.conf',
:user => 'ec2api-tester',
:project => 'openstack'
:ensure => 'present',
:tempest_conf_path => '/var/lib/tempest/etc/tempest.conf',
:user => 'ec2api-tester',
:project => 'openstack'
)
end
@ -212,10 +212,10 @@ describe 'tempest' do
is_expected.to contain_tempest_config('compute/image_alt_ssh_user').with(:value => nil)
is_expected.to contain_tempest_config('compute/image_ref').with(:value => nil)
is_expected.to contain_tempest_config('compute/image_ref_alt').with(:value => nil)
is_expected.to contain_tempest_config('compute/image_ssh_user').with(:value => nil)
is_expected.to contain_tempest_config('compute/resize_available').with(:value => nil)
is_expected.to contain_tempest_config('compute/build_interval').with(:value => nil)
is_expected.to contain_tempest_config('compute-feature-enabled/attach_encrypted_volume').with(:value => false)
is_expected.to contain_tempest_config('validation/image_ssh_user').with(:value => nil)
is_expected.to contain_tempest_config('identity/admin_role').with(:value => nil)
is_expected.to contain_tempest_config('identity/auth_version').with(:value => 'v2')
is_expected.to contain_tempest_config('identity/alt_password').with(:value => nil)
@ -335,7 +335,7 @@ describe 'tempest' do
context 'with when managing tests packages for sahara (optional service)' do
let :params do
{ :manage_tests_packages => true,
:sahara_available => true }
:sahara_available => true }
end
describe "should install sahara tests package" do
@ -346,7 +346,7 @@ describe 'tempest' do
context 'with when managing tests packages for neutron (optional service)' do
let :params do
{ :manage_tests_packages => true,
:neutron_available => true }
:neutron_available => true }
end
describe "should install neutron and *aas tests packages" do