Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/366885 )
Change subject: phabricator: make phab1001 use role::spare for now
......................................................................
phabricator: make phab1001 use role::spare for now
Assigning the phabricator role to both iridium and phab1001
caused IP conflicts because it adds a secondary IP
for phab-vcs.
Until that is cleared out we want phab1001 to get updates and
not have disabled puppet.
Bug: T163938
Change-Id: I45b428c64f4a5fc6a258fb362ee241baf3b4922c
---
M manifests/site.pp
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index da5d799..2438389 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1107,12 +1107,16 @@
}
# Phabricator
-node /^(iridium\.eqiad|phab1001\.eqiad|phab2001\.codfw)\.wmnet$/ {
+node /^(iridium\.eqiad|phab2001\.codfw)\.wmnet$/ {
role(phabricator_server)
include ::ganglia
interface::add_ip6_mapped { 'main': }
}
+node 'phab1001.eqiad.wmnet' {
+ role(spare::system)
+}
+
node 'iron.wikimedia.org' {
system::role { 'misc':
description => 'Experimental Yubico two factor authentication bastion',
--
To view, visit https://gerrit.wikimedia.org/r/366885
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I45b428c64f4a5fc6a258fb362ee241baf3b4922c
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: RobH <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
