Dzahn has submitted this change and it was merged.
Change subject: palladium: Use the role keyword
......................................................................
palladium: Use the role keyword
We need this for Hiera-based assignment of Salt grains for debdeploy
(I'm unsure about whether role::conftool::master can be folded in as well?)
Change-Id: I21dbfb159217843574e86fc05c8b5fed352cf2aa
---
M manifests/site.pp
1 file changed, 1 insertion(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 809ee10..0fd6e1f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2170,15 +2170,9 @@
# primary puppet master
node 'palladium.eqiad.wmnet' {
+ role ipmi, salt::masters::production, deployment::salt_masters,
access_new_install, puppetmaster::frontend, pybal_config, debdeploymaster
include standard
- include role::ipmi
- include role::salt::masters::production
- include role::deployment::salt_masters
- include role::access_new_install
- include role::puppetmaster::frontend
- include role::pybal_config
include role::conftool::master
- include role::debdeploymaster
}
# parser cache databases
--
To view, visit https://gerrit.wikimedia.org/r/247217
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I21dbfb159217843574e86fc05c8b5fed352cf2aa
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
