Merge branch 'jenkins-build-56' into 'master'
Auto-merge for build 56 See merge request puppet/puppet_cd!52
This commit is contained in:
@@ -227,7 +227,7 @@ class puppet_cd::r10k::install (
|
||||
|
||||
exec { 'install rpm':
|
||||
command => "yum install -y ${pt_r10k_webhook_pkg}",
|
||||
unless => "rpm -qa | grep ${pt_r10k_webhook_pkg}",
|
||||
unless => 'rpm -qa | grep webhook-go',
|
||||
require => File[$pt_r10k_webhook_pkg],
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ class puppet_cd::r10k::install (
|
||||
|
||||
exec { 'install rpm':
|
||||
command => "yum install -y ${pt_r10k_webhook_pkg}",
|
||||
unless => "rpm -qa | grep ${pt_r10k_webhook_pkg}",
|
||||
unless => 'rpm -qa | grep webhook-go',
|
||||
require => File[$pt_r10k_webhook_pkg],
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user