Merge "Fix duplicated user keys" into stable/train
This commit is contained in:
commit
ec7d906d75
|
@ -27,7 +27,6 @@ describe 'nova::cron::purge_shadow_tables' do
|
||||||
it 'configures a nova purge cron with verbose output' do
|
it 'configures a nova purge cron with verbose output' do
|
||||||
is_expected.to contain_cron('nova-manage db purge').with(
|
is_expected.to contain_cron('nova-manage db purge').with(
|
||||||
:command => "nova-manage db purge --before `date --date='today - #{params[:age]} days' +\\%D` --verbose >>#{params[:destination]} 2>&1",
|
:command => "nova-manage db purge --before `date --date='today - #{params[:age]} days' +\\%D` --verbose >>#{params[:destination]} 2>&1",
|
||||||
:user => 'nova',
|
|
||||||
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
|
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
|
||||||
:user => params[:user],
|
:user => params[:user],
|
||||||
:minute => params[:minute],
|
:minute => params[:minute],
|
||||||
|
@ -50,7 +49,6 @@ describe 'nova::cron::purge_shadow_tables' do
|
||||||
it 'configures a nova purge cron without verbose output' do
|
it 'configures a nova purge cron without verbose output' do
|
||||||
is_expected.to contain_cron('nova-manage db purge').with(
|
is_expected.to contain_cron('nova-manage db purge').with(
|
||||||
:command => "nova-manage db purge --before `date --date='today - #{params[:age]} days' +\\%D` >>#{params[:destination]} 2>&1",
|
:command => "nova-manage db purge --before `date --date='today - #{params[:age]} days' +\\%D` >>#{params[:destination]} 2>&1",
|
||||||
:user => 'nova',
|
|
||||||
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
|
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
|
||||||
:user => params[:user],
|
:user => params[:user],
|
||||||
:minute => params[:minute],
|
:minute => params[:minute],
|
||||||
|
@ -73,7 +71,6 @@ describe 'nova::cron::purge_shadow_tables' do
|
||||||
it 'configures a nova purge cron with all cells enabled' do
|
it 'configures a nova purge cron with all cells enabled' do
|
||||||
is_expected.to contain_cron('nova-manage db purge').with(
|
is_expected.to contain_cron('nova-manage db purge').with(
|
||||||
:command => "nova-manage db purge --before `date --date='today - #{params[:age]} days' +%D` --verbose --all-cells >>#{params[:destination]} 2>&1",
|
:command => "nova-manage db purge --before `date --date='today - #{params[:age]} days' +%D` --verbose --all-cells >>#{params[:destination]} 2>&1",
|
||||||
:user => 'nova',
|
|
||||||
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
|
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
|
||||||
:user => params[:user],
|
:user => params[:user],
|
||||||
:minute => params[:minute],
|
:minute => params[:minute],
|
||||||
|
|
Loading…
Reference in New Issue