Ryan Lane has submitted this change and it was merged.
Change subject: Qualify grain-ensure exec/unless/onlyif
......................................................................
Qualify grain-ensure exec/unless/onlyif
Change-Id: Ic8b981ebe43eb17fa1a2ed2aef11625ffff35c05
---
M modules/salt/manifests/grain.pp
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/salt/manifests/grain.pp b/modules/salt/manifests/grain.pp
index a00b1d7..a92a861 100644
--- a/modules/salt/manifests/grain.pp
+++ b/modules/salt/manifests/grain.pp
@@ -27,13 +27,13 @@
$ensure = present,
) {
if $ensure == 'absent' {
- exec { "grain-ensure remove ${grain} ${value}":
- onlyif => "grain-ensure contains ${grain} ${value}",
+ exec { "/usr/local/sbin/grain-ensure remove ${grain} ${value}":
+ onlyif => "/usr/local/sbin/grain-ensure contains ${grain} ${value}",
require => File['/usr/local/sbin/grain-ensure'],
}
} else {
- exec { "grain-ensure set ${grain} ${value}":
- unless => "grain-ensure contains ${grain} ${value}",
+ exec { "/usr/local/sbin/grain-ensure set ${grain} ${value}":
+ unless => "/usr/local/sbin/grain-ensure contains ${grain} ${value}",
require => File['/usr/local/sbin/grain-ensure'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/71859
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8b981ebe43eb17fa1a2ed2aef11625ffff35c05
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
