Merge "Pass auth token to Timmy"
This commit is contained in:
commit
58dd9d2f2c
|
@ -35,8 +35,10 @@ module Astute
|
||||||
base_dir = File.dirname(settings['target'])
|
base_dir = File.dirname(settings['target'])
|
||||||
dest_dir = File.join(base_dir, snapshot)
|
dest_dir = File.join(base_dir, snapshot)
|
||||||
dest_file = File.join(dest_dir, "config.tar.gz")
|
dest_file = File.join(dest_dir, "config.tar.gz")
|
||||||
|
token = settings['auth-token']
|
||||||
dump_cmd = "mkdir -p #{dest_dir} && "\
|
dump_cmd = "mkdir -p #{dest_dir} && "\
|
||||||
"timmy --logs --days 3 --dest-file #{dest_file} --log-file #{log_file} && "\
|
"timmy --logs --days 3 --dest-file #{dest_file}"\
|
||||||
|
" --fuel-token #{token} --log-file #{log_file} && "\
|
||||||
"tar --directory=#{base_dir} -cf #{dest_dir}.tar #{snapshot} && "\
|
"tar --directory=#{base_dir} -cf #{dest_dir}.tar #{snapshot} && "\
|
||||||
"echo #{dest_dir}.tar > #{settings['lastdump']} && "\
|
"echo #{dest_dir}.tar > #{settings['lastdump']} && "\
|
||||||
"rm -rf #{dest_dir}"
|
"rm -rf #{dest_dir}"
|
||||||
|
|
|
@ -24,6 +24,7 @@ describe 'dump_environment' do
|
||||||
'lastdump' => '/last/dump/path',
|
'lastdump' => '/last/dump/path',
|
||||||
'target' => '/var/dump/path',
|
'target' => '/var/dump/path',
|
||||||
'timeout' => 300,
|
'timeout' => 300,
|
||||||
|
'auth-token' => '42'
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
let(:rpc_mock) { mock_rpcclient }
|
let(:rpc_mock) { mock_rpcclient }
|
||||||
|
@ -41,7 +42,7 @@ describe 'dump_environment' do
|
||||||
target = settings['target']
|
target = settings['target']
|
||||||
dump_cmd = "mkdir -p #{target} && "\
|
dump_cmd = "mkdir -p #{target} && "\
|
||||||
"timmy --logs --days 3 --dest-file #{target}/config.tar.gz "\
|
"timmy --logs --days 3 --dest-file #{target}/config.tar.gz "\
|
||||||
"--log-file /var/log/timmy.log && "\
|
"--fuel-token 42 --log-file /var/log/timmy.log && "\
|
||||||
"tar --directory=/var/dump -cf #{target}.tar path && "\
|
"tar --directory=/var/dump -cf #{target}.tar path && "\
|
||||||
"echo #{target}.tar > #{settings['lastdump']} && "\
|
"echo #{target}.tar > #{settings['lastdump']} && "\
|
||||||
"rm -rf #{target}"
|
"rm -rf #{target}"
|
||||||
|
|
Loading…
Reference in New Issue