Ori.livneh has submitted this change and it was merged.
Change subject: Trebuchet: call saltutil.{sync_all,refresh_pillars} when
setting grains
......................................................................
Trebuchet: call saltutil.{sync_all,refresh_pillars} when setting grains
Per Ryan's advice.
Change-Id: Ied1dfdeb531de00b905264fa3e6ee625d2d6ed94
---
M modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
b/modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
index 260677b..831988a 100644
--- a/modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
+++ b/modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
@@ -68,6 +68,12 @@
salt_cmd *args.map(&:split).flatten.unshift('--out=json')
end
+ # Synchronize local state with Salt master.
+ def salt_refresh!
+ salt 'saltutil.sync_all'
+ salt 'saltutil.refresh_pillar'
+ end
+
# Make sure that the salt-minion service is running.
def check_salt_minion_status
begin
@@ -139,6 +145,7 @@
def install
unless targets.include? base
salt 'grains.append', 'deployment_target', base
+ salt_refresh!
end
salt 'deploy.fetch', qualified_name
salt 'deploy.checkout', qualified_name
@@ -148,6 +155,7 @@
# on disk; it merely unsets the `deployment_target` grain value.
def uninstall
salt 'grains.remove', 'deployment_target', base
+ salt_refresh!
end
def update
--
To view, visit https://gerrit.wikimedia.org/r/155793
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied1dfdeb531de00b905264fa3e6ee625d2d6ed94
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
