BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/389871 )
Change subject: LVS/phabricator: add git-ssh in codfw
......................................................................
LVS/phabricator: add git-ssh in codfw
Bug: T164810
Change-Id: Id8e4699f321ccc5fc00d388e80d531177e40d381
---
M conftool-data/node/codfw.yaml
M conftool-data/service/misc.yaml
M hieradata/common/lvs/configuration.yaml
M hieradata/role/codfw/phabricator_server.yaml
4 files changed, 11 insertions(+), 0 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
BBlack: Looks good to me, approved
Zppix: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/conftool-data/node/codfw.yaml b/conftool-data/node/codfw.yaml
index dc9e1a2..0469398 100644
--- a/conftool-data/node/codfw.yaml
+++ b/conftool-data/node/codfw.yaml
@@ -212,6 +212,8 @@
cp2012.codfw.wmnet: [varnish-fe, varnish-be, nginx]
cp2018.codfw.wmnet: [varnish-fe, varnish-be, nginx]
cp2025.codfw.wmnet: [varnish-fe, varnish-be, nginx]
+ phabricator:
+ phab2001-vcs.codfw.wmnet: [git-ssh]
swift:
ms-fe2005.codfw.wmnet: [swift-fe, nginx]
ms-fe2006.codfw.wmnet: [swift-fe, nginx]
diff --git a/conftool-data/service/misc.yaml b/conftool-data/service/misc.yaml
index 9ccfe81..2f9f316 100644
--- a/conftool-data/service/misc.yaml
+++ b/conftool-data/service/misc.yaml
@@ -17,6 +17,7 @@
"weight": 10
datacenters:
- eqiad
+ - codfw
prometheus:
prometheus:
port: 80
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index 5737c78..79717af 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -91,6 +91,9 @@
eqiad:
git-ssh4: 208.80.154.250
git-ssh6: 2620:0:861:ed1a::3:16
+ codfw:
+ git-ssh4: 208.80.153.250
+ git-ssh6: 2620:0:860:ed1a::3:fa
aqs: &ip_block025
eqiad: 10.2.2.12
eventbus: &ip_block026
@@ -837,6 +840,7 @@
class: high-traffic2
sites:
- eqiad
+ - codfw
ip: *ip_block024
port: 22
depool-threshold: '.6'
diff --git a/hieradata/role/codfw/phabricator_server.yaml
b/hieradata/role/codfw/phabricator_server.yaml
index 5601217..bbe7aa8 100644
--- a/hieradata/role/codfw/phabricator_server.yaml
+++ b/hieradata/role/codfw/phabricator_server.yaml
@@ -8,6 +8,10 @@
- "10.192.32.149"
- "[2620:0:860:103:10:192:32:149]"
+lvs::realserver::realserver_ips:
+ - "208.80.153.250"
+ - "2620:0:860:ed1a::3:fa"
+
phabricator::mysql::master: "m3-master.eqiad.wmnet"
# todo: replace with a codfw slave (do we have a phab db server in codfw?)
phabricator::mysql::slave: "m3-slave.eqiad.wmnet"
--
To view, visit https://gerrit.wikimedia.org/r/389871
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8e4699f321ccc5fc00d388e80d531177e40d381
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Zppix <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
