openstack
/
puppet-rally
Code Issues Proposed changes

Merge "Replace outdated command to create rally db"

This commit is contained in:
Zuul 2023-02-26 17:35:04 +00:00 committed by Gerrit Code Review
parent b75dac9737 16a35f2fc6
commit c9918ca7da
2 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/db/sync.pp
View File

@ -5,8 +5,8 @@
# #
# [*extra_params*] # [*extra_params*]
# (Optional) String of extra command line parameters to append # (Optional) String of extra command line parameters to append
# to the rally-manage db sync command. These will be inserted # to the rally db sync command. These will be inserted in the command line
# in the command line between 'rally-manage' and 'db create'. # between 'rally' and 'db create'.
# Defaults to '--config-file /etc/rally/rally.conf' # Defaults to '--config-file /etc/rally/rally.conf'
# #
# [*db_sync_timeout*] # [*db_sync_timeout*]
@ -20,8 +20,8 @@ class rally::db::sync(
include rally::deps include rally::deps
exec { 'rally-manage db_sync': exec { 'rally db_sync':
command => "rally-manage ${extra_params} db create", command => "rally ${extra_params} db create",
path => '/usr/bin', path => '/usr/bin',
user => 'root', user => 'root',
refreshonly => true, refreshonly => true,

55
spec/classes/rally_db_sync_spec.rb
View File

@ -6,9 +6,9 @@ describe 'rally::db::sync' do
it { is_expected.to contain_class('rally::deps') } it { is_expected.to contain_class('rally::deps') }
it 'runs rally-manage db_sync' do it 'runs rally db_sync' do
is_expected.to contain_exec('rally-manage db_sync').with( is_expected.to contain_exec('rally db_sync').with(
:command => 'rally-manage --config-file /etc/rally/rally.conf db create', :command => 'rally --config-file /etc/rally/rally.conf db create',
:user => 'root', :user => 'root',
:path => '/usr/bin', :path => '/usr/bin',
:refreshonly => 'true', :refreshonly => 'true',
@ -24,33 +24,32 @@ describe 'rally::db::sync' do
) )
end end
describe "overriding params" do context "overriding params" do
let :params do let :params do
{ {
:extra_params => '--config-file /var/lib/rally/rally.conf', :extra_params => '--config-file /var/lib/rally/rally.conf',
:db_sync_timeout => 750, :db_sync_timeout => 750,
}
end
it {
is_expected.to contain_exec('rally db_sync').with(
:command => 'rally --config-file /var/lib/rally/rally.conf db create',
:user => 'root',
:path => '/usr/bin',
:refreshonly => 'true',
:try_sleep => 5,
:tries => 10,
:timeout => 750,
:logoutput => 'on_failure',
:subscribe => ['Anchor[rally::install::end]',
'Anchor[rally::config::end]',
'Anchor[rally::dbsync::begin]'],
:notify => 'Anchor[rally::dbsync::end]',
:tag => 'openstack-db',
)
} }
end end
it {
is_expected.to contain_exec('rally-manage db_sync').with(
:command => 'rally-manage --config-file /var/lib/rally/rally.conf db create',
:user => 'root',
:path => '/usr/bin',
:refreshonly => 'true',
:try_sleep => 5,
:tries => 10,
:timeout => 750,
:logoutput => 'on_failure',
:subscribe => ['Anchor[rally::install::end]',
'Anchor[rally::config::end]',
'Anchor[rally::dbsync::begin]'],
:notify => 'Anchor[rally::dbsync::end]',
:tag => 'openstack-db',
)
}
end
end end
on_supported_os({ on_supported_os({