Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327691 )
Change subject: contint: combine contint1001/2001 in a single node regex
......................................................................
contint: combine contint1001/2001 in a single node regex
Now that both hosts are including identical roles we can merge
them into one regex. This way we see right away they are identical
and we can be sure to avoid subtle differences.
We will probably never change this since our actual switch
is in Hiera now.
Bug: T150771
Change-Id: Icb99b1a801b9168c0d9ba869984d5a8ccf668982
---
M manifests/site.pp
1 file changed, 2 insertions(+), 16 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index d14a6cb..c961ce3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -286,8 +286,8 @@
include base::firewall
}
-# CI master
-node 'contint1001.wikimedia.org' {
+# CI master / CI standby (switch in Hiera)
+node /^(contint1001|contint2001)\.wikimedia\.org$/ {
role(ci::master,
ci::slave,
ci::website,
@@ -297,20 +297,6 @@
include standard
interface::add_ip6_mapped { 'main': interface => 'eth0', }
include contint::firewall
-}
-
-# CI warm
-node 'contint2001.wikimedia.org' {
- role(ci::master,
- ci::slave,
- ci::website,
- zuul::server,
- backup::host)
-
- include standard
- interface::add_ip6_mapped { 'main': interface => 'eth0', }
- include contint::firewall
-
}
# Debian package/docker images building host in production
--
To view, visit https://gerrit.wikimedia.org/r/327691
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb99b1a801b9168c0d9ba869984d5a8ccf668982
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
