Gehel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/294914
Change subject: Configuration for new maps cluster in eqiad
......................................................................
Configuration for new maps cluster in eqiad
Base configuration added. The maps slaves are still commented out in site.pp
to ensure we install the master first.
Change-Id: I398157c77a1c278056191bcc223fc91b977fb65b
---
A hieradata/hosts/maps1001.yaml
A hieradata/hosts/maps1002.yaml
A hieradata/hosts/maps1003.yaml
A hieradata/hosts/maps1004.yaml
A hieradata/role/eqiad/maps/master.yaml
A hieradata/role/eqiad/maps/server.yaml
A hieradata/role/eqiad/maps/slave.yaml
M manifests/site.pp
8 files changed, 62 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/294914/1
diff --git a/hieradata/hosts/maps1001.yaml b/hieradata/hosts/maps1001.yaml
new file mode 100644
index 0000000..9f2723a
--- /dev/null
+++ b/hieradata/hosts/maps1001.yaml
@@ -0,0 +1,2 @@
+cassandra::rack: a4
+do_paging: false
diff --git a/hieradata/hosts/maps1002.yaml b/hieradata/hosts/maps1002.yaml
new file mode 100644
index 0000000..160db87
--- /dev/null
+++ b/hieradata/hosts/maps1002.yaml
@@ -0,0 +1,2 @@
+cassandra::rack: b4
+do_paging: false
diff --git a/hieradata/hosts/maps1003.yaml b/hieradata/hosts/maps1003.yaml
new file mode 100644
index 0000000..4e53a74
--- /dev/null
+++ b/hieradata/hosts/maps1003.yaml
@@ -0,0 +1,2 @@
+cassandra::rack: c5
+do_paging: false
diff --git a/hieradata/hosts/maps1004.yaml b/hieradata/hosts/maps1004.yaml
new file mode 100644
index 0000000..7e4068c
--- /dev/null
+++ b/hieradata/hosts/maps1004.yaml
@@ -0,0 +1,2 @@
+cassandra::rack: d3
+do_paging: false
diff --git a/hieradata/role/eqiad/maps/master.yaml
b/hieradata/role/eqiad/maps/master.yaml
new file mode 100644
index 0000000..4f9e59c
--- /dev/null
+++ b/hieradata/role/eqiad/maps/master.yaml
@@ -0,0 +1,32 @@
+# Defined in the private repo
+#cassandra::super_password: some_password
+#maps::postgresql_tilerator_pass: some_password
+#maps::postgresql_tileratorui_pass: some_password
+#maps::postgresql_kartotherian_pass: some_password
+#maps::postgresql_osmimporter_pass: some_password
+#maps::postgresql_osmupdater_pass: some_password
+#maps::postgres_slaves:
+# replication@maps1002-v4:
+# user: replication
+# password: some_password
+# cidr: 10.64.16.42
+# pgversion: 9.4
+# attrs: REPLICATION
+# database: replication
+# replication@maps1003-v4:
+# user: replication
+# password: some_password
+# cidr: 10.64.32.117
+# pgversion: 9.4
+# attrs: REPLICATION
+# database: replication
+# replication@maps1004-v4:
+# user: replication
+# password: some_password
+# cidr: 10.64.48.154
+# pgversion: 9.4
+# attrs: REPLICATION
+# database: replication
+#maps::cassandra_tilerator_pass: some_password
+#maps::cassandra_tileratorui_pass: some_password
+#maps::cassandra_kartotherian_pass: some_password
diff --git a/hieradata/role/eqiad/maps/server.yaml
b/hieradata/role/eqiad/maps/server.yaml
new file mode 100644
index 0000000..72a3287
--- /dev/null
+++ b/hieradata/role/eqiad/maps/server.yaml
@@ -0,0 +1,10 @@
+cassandra::seeds: [ 10.64.0.79, 10.64.16.42, 10.64.32.117, 10.64.48.154 ]
+cassandra::dc: eqiad
+#lvs::realserver::realserver_ips:
+# - 1.2.3.4 TODO: define LVS ip once it is configured
+maps::hosts:
+ - maps1001.eqiad.wmnet
+ - maps1002.eqiad.wmnet
+ - maps1003.eqiad.wmnet
+ - maps1004.eqiad.wmnet
+maps::redis_server: redis://maps1001.codfw.wmnet
diff --git a/hieradata/role/eqiad/maps/slave.yaml
b/hieradata/role/eqiad/maps/slave.yaml
new file mode 100644
index 0000000..e9d4771
--- /dev/null
+++ b/hieradata/role/eqiad/maps/slave.yaml
@@ -0,0 +1 @@
+postgresql::slave::master_server: maps1001.eqiad.wmnet
diff --git a/manifests/site.pp b/manifests/site.pp
index ab9e343..0b53d3f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1944,6 +1944,17 @@
include base::firewall
}
+node 'maps1001.eqiad.wmnet' {
+ role maps::server, maps::master
+ include base::firewall
+}
+
+# Waiting for master to be configured before configuring the slaves
+# node /^maps100[2-4]\.eqiad\.wmnet/ {
+# role maps::server, maps::slave
+# include base::firewall
+# }
+
node 'maps2001.codfw.wmnet' {
role maps::server, maps::master
include base::firewall
--
To view, visit https://gerrit.wikimedia.org/r/294914
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I398157c77a1c278056191bcc223fc91b977fb65b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <gleder...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
