ArielGlenn has submitted this change and it was merged.
Change subject: move git-deploy to neodymium (primary salt master)
......................................................................
move git-deploy to neodymium (primary salt master)
Change-Id: Idc3a51d753978725118c8cbf11f1337c7f60b67c
---
M manifests/site.pp
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 9864f0d..932b4ab 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2117,8 +2117,7 @@
# secondary salt master
node 'neodymium.eqiad.wmnet' {
-# role salt::masters::production, deployment::salt_masters,
debdeploy::master
- role salt::masters::production, debdeploy::master
+ role salt::masters::production, deployment::salt_masters, debdeploy::master
include standard
}
@@ -2191,7 +2190,7 @@
# primary puppet master
node 'palladium.eqiad.wmnet' {
- role ipmi, salt::masters::production, deployment::salt_masters,
access_new_install, puppetmaster::frontend, pybal_config, debdeploy::master
+ role ipmi, salt::masters::production, access_new_install,
puppetmaster::frontend, pybal_config, debdeploy::master
include standard
include role::conftool::master
}
--
To view, visit https://gerrit.wikimedia.org/r/265248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idc3a51d753978725118c8cbf11f1337c7f60b67c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
