Gehel has submitted this change and it was merged.
Change subject: Preparing configuration for new maps servers
......................................................................
Preparing configuration for new maps servers
Some configuration has been dulipcated for each node. We will be able to move
those configuration back to hieradata/role/codfw/maps/*.yaml once the
maps-test* nodes have been decommisssioned.
Bug: T134901
Change-Id: Ic1d444b254761a5841bcd3ab83fe84e5f9510426
---
A hieradata/hosts/maps2001.yaml
A hieradata/hosts/maps2002.yaml
A hieradata/hosts/maps2003.yaml
A hieradata/hosts/maps2004.yaml
M manifests/site.pp
5 files changed, 61 insertions(+), 0 deletions(-)
Approvals:
Gehel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/maps2001.yaml b/hieradata/hosts/maps2001.yaml
new file mode 100644
index 0000000..368f0bd
--- /dev/null
+++ b/hieradata/hosts/maps2001.yaml
@@ -0,0 +1,12 @@
+cassandra::rack: a5
+do_paging: false
+
+# the following variables can be moved back to
+# hieradata/role/codfw/maps/slave.yaml once maps-test* servers have been
+# decommissionned.
+
+cassandra::seeds: [ 10.192.0.144, 10.192.16.179, 10.192.32.146, 10.192.48.57 ]
+maps::hosts: [ maps2001.codfw.wmnet, maps2002.codfw.wmnet,
maps2003.codfw.wmnet, maps2004.codfw.wmnet ]
+# To be configured once we have an LVS endpoint ready
+#lvs::realserver::realserver_ips:
+# - 10.2.1.13
diff --git a/hieradata/hosts/maps2002.yaml b/hieradata/hosts/maps2002.yaml
new file mode 100644
index 0000000..ef71183
--- /dev/null
+++ b/hieradata/hosts/maps2002.yaml
@@ -0,0 +1,13 @@
+cassandra::rack: b5
+do_paging: false
+
+# the following variables can be moved back to
+# hieradata/role/codfw/maps/slave.yaml once maps-test* servers have been
+# decommissionned.
+
+postgresql::slave::master_server: maps2001.codfw.wmnet
+cassandra::seeds: [ 10.192.0.144, 10.192.16.179, 10.192.32.146, 10.192.48.57 ]
+maps::hosts: [ maps2001.codfw.wmnet, maps2002.codfw.wmnet,
maps2003.codfw.wmnet, maps2004.codfw.wmnet ]
+# To be configured once we have an LVS endpoint ready
+#lvs::realserver::realserver_ips:
+# - 10.2.1.13
diff --git a/hieradata/hosts/maps2003.yaml b/hieradata/hosts/maps2003.yaml
new file mode 100644
index 0000000..b892277
--- /dev/null
+++ b/hieradata/hosts/maps2003.yaml
@@ -0,0 +1,13 @@
+cassandra::rack: c5
+do_paging: false
+
+# the following variables can be moved back to
+# hieradata/role/codfw/maps/slave.yaml once maps-test* servers have been
+# decommissionned.
+
+postgresql::slave::master_server: maps2001.codfw.wmnet
+cassandra::seeds: [ 10.192.0.144, 10.192.16.179, 10.192.32.146, 10.192.48.57 ]
+maps::hosts: [ maps2001.codfw.wmnet, maps2002.codfw.wmnet,
maps2003.codfw.wmnet, maps2004.codfw.wmnet ]
+# To be configured once we have an LVS endpoint ready
+#lvs::realserver::realserver_ips:
+# - 10.2.1.13
diff --git a/hieradata/hosts/maps2004.yaml b/hieradata/hosts/maps2004.yaml
new file mode 100644
index 0000000..94f07c4
--- /dev/null
+++ b/hieradata/hosts/maps2004.yaml
@@ -0,0 +1,13 @@
+cassandra::rack: d5
+do_paging: false
+
+# the following variables can be moved back to
+# hieradata/role/codfw/maps/slave.yaml once maps-test* servers have been
+# decommissionned.
+
+postgresql::slave::master_server: maps2001.codfw.wmnet
+cassandra::seeds: [ 10.192.0.144, 10.192.16.179, 10.192.32.146, 10.192.48.57 ]
+maps::hosts: [ maps2001.codfw.wmnet, maps2002.codfw.wmnet,
maps2003.codfw.wmnet, maps2004.codfw.wmnet ]
+# To be configured once we have an LVS endpoint ready
+#lvs::realserver::realserver_ips:
+# - 10.2.1.13
diff --git a/manifests/site.pp b/manifests/site.pp
index 919b52b..2720a99 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1951,6 +1951,16 @@
include base::firewall
}
+node 'maps2001.codfw.wmnet' {
+ role maps::server, maps::master
+ include base::firewall
+}
+
+node /^maps200[2-4]\.codfw\.wmnet/ {
+ role maps::server, maps::slave
+ include base::firewall
+}
+
node /^mc(10[01][0-9])\.eqiad\.wmnet/ {
role memcached
}
--
To view, visit https://gerrit.wikimedia.org/r/287992
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1d444b254761a5841bcd3ab83fe84e5f9510426
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
