Dzahn has submitted this change and it was merged.
Change subject: Use one node definition for both tin and mira
......................................................................
Use one node definition for both tin and mira
Both deployment servers should be identical
Bug: T95436
Change-Id: Id4de0e218945b7cf5444c5d05713fb076d295448
---
M manifests/site.pp
1 file changed, 2 insertions(+), 14 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 7874dda..93926cb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1795,19 +1795,6 @@
role otrs
}
-# codfw deployment host (pending set up)
-node 'mira.codfw.wmnet' {
-
- role deployment::server
- include standard
- include base::firewall
- include role::labsdb::manager
-
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
-}
-
node 'multatuli.wikimedia.org' {
role spare
@@ -2443,7 +2430,8 @@
include ::eventlogging::package
}
-node 'tin.eqiad.wmnet' {
+# deployment servers
+node 'tin.eqiad.wmnet', 'mira.codfw.wmnet' {
role deployment::server
include standard
--
To view, visit https://gerrit.wikimedia.org/r/223458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4de0e218945b7cf5444c5d05713fb076d295448
Gerrit-PatchSet: 15
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits