Merge "Make storyboard idempotent"

This commit is contained in:
Jenkins 2014-04-21 21:04:57 +00:00 committed by Gerrit Code Review
commit b6e774be83

View File

@ -166,11 +166,12 @@ class storyboard (
group => 'storyboard', group => 'storyboard',
} }
# Using -z here to only download when the tarball has changed. # Checking last modified time versus mtime on the file
exec { 'get-webclient': exec { 'get-webclient':
command => "curl ${storyboard_webclient_url} -z ./${tarball} -o ${tarball}", command => "curl ${storyboard_webclient_url} -z ./${tarball} -o ${tarball}",
path => '/bin:/usr/bin', path => '/bin:/usr/bin',
cwd => '/var/lib/storyboard', cwd => '/var/lib/storyboard',
onlyif => "curl -I ${storyboard_webclient_url} -z ./${tarball} | grep '200 OK'",
require => [ require => [
File['/var/lib/storyboard'], File['/var/lib/storyboard'],
Package['curl'], Package['curl'],
@ -178,10 +179,11 @@ class storyboard (
} }
exec { 'unpack-webclient': exec { 'unpack-webclient':
command => "tar -xzf ${tarball}", command => "tar -xzf ${tarball}",
path => '/bin:/usr/bin', path => '/bin:/usr/bin',
cwd => '/var/lib/storyboard', cwd => '/var/lib/storyboard',
require => Exec['get-webclient'], refreshonly => true,
subscribe => Exec['get-webclient'],
} }
file { '/var/lib/storyboard/www': file { '/var/lib/storyboard/www':