Merge branch 'jenkins-build-55' into 'master'
Auto-merge for build 55 See merge request puppet/puppet_cd!51
This commit is contained in:
@@ -163,7 +163,8 @@
|
||||
65
|
||||
66
|
||||
67
|
||||
68</pre>
|
||||
68
|
||||
69</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/r10k/install.pp', line 6</span>
|
||||
@@ -225,7 +226,8 @@ class puppet_cd::r10k::install (
|
||||
}
|
||||
|
||||
exec { 'install rpm':
|
||||
command => "yum install ${pt_r10k_webhook_pkg}",
|
||||
command => "yum install -y ${pt_r10k_webhook_pkg}",
|
||||
unless => "rpm -qa | grep ${pt_r10k_webhook_pkg}",
|
||||
require => File[$pt_r10k_webhook_pkg],
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,7 +60,8 @@ class puppet_cd::r10k::install (
|
||||
}
|
||||
|
||||
exec { 'install rpm':
|
||||
command => "yum install ${pt_r10k_webhook_pkg}",
|
||||
command => "yum install -y ${pt_r10k_webhook_pkg}",
|
||||
unless => "rpm -qa | grep ${pt_r10k_webhook_pkg}",
|
||||
require => File[$pt_r10k_webhook_pkg],
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user