Ryan Lane has submitted this change and it was merged.
Change subject: Support 'ensure => absent' in deployment::target & salt::grain
......................................................................
Support 'ensure => absent' in deployment::target & salt::grain
This patch adds support for the 'ensure' parameter to the deployment::target
and salt::grain resource types. As 'present' is the default, existing resources
(which do not declare an ensure parameter) will continue to work as before.
Change-Id: I3dd9a46295e8d0ffb18d822415fe377f1056d2cf
---
M modules/deployment/manifests/target.pp
M modules/salt/manifests/grain.pp
2 files changed, 13 insertions(+), 5 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/deployment/manifests/target.pp
b/modules/deployment/manifests/target.pp
index 4883795..13dd101 100644
--- a/modules/deployment/manifests/target.pp
+++ b/modules/deployment/manifests/target.pp
@@ -1,6 +1,7 @@
-define deployment::target() {
+define deployment::target($ensure=present) {
salt::grain { "deployment_target_$name":
- grain => "deployment_target",
- value => $name;
+ ensure => $ensure,
+ grain => "deployment_target",
+ value => $name;
}
}
diff --git a/modules/salt/manifests/grain.pp b/modules/salt/manifests/grain.pp
index 4d7df75..bb35002 100644
--- a/modules/salt/manifests/grain.pp
+++ b/modules/salt/manifests/grain.pp
@@ -1,10 +1,17 @@
define salt::grain(
$grain,
- $value) {
+ $value,
+ $ensure = present,
+) {
+
+ $opts = $ensure ? {
+ absent => '--purge',
+ default => '',
+ }
if ! defined(Exec["grain_$grain_$value"]) {
exec { "grain_$grain_$value":
- command => "/usr/local/sbin/grain-merge $grain $value",
+ command => "/usr/local/sbin/grain-merge $opts $grain $value",
require => File["/usr/local/sbin/grain-merge"];
}
}
--
To view, visit https://gerrit.wikimedia.org/r/71758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3dd9a46295e8d0ffb18d822415fe377f1056d2cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ryan Lane <rl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
