[MediaWiki-commits] [Gerrit] Moving elasticsearch masters to new servers - change (operations/puppet)

2016-06-23 Thread Gehel (Code Review) 
Gehel has submitted this change and it was merged.

Change subject: Moving elasticsearch masters to new servers
..


Moving elasticsearch masters to new servers

This is required to be able to decommission the old elasticsearch servers.

Bug: T138329
Change-Id: Idd7e769df8dc5ad4467cfc464af88d43778fa5ba
---
D hieradata/hosts/elastic1008.yaml
D hieradata/hosts/elastic1013.yaml
R hieradata/hosts/elastic1030.yaml
C hieradata/hosts/elastic1036.yaml
C hieradata/hosts/elastic1040.yaml
M hieradata/regex.yaml
M hieradata/role/eqiad/elasticsearch/server.yaml
7 files changed, 4 insertions(+), 10 deletions(-)

Approvals:
  Gehel: Looks good to me, approved
  DCausse: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/hieradata/hosts/elastic1008.yaml b/hieradata/hosts/elastic1008.yaml
deleted file mode 100644
index 41eab79..000
--- a/hieradata/hosts/elastic1008.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-elasticsearch::master_eligible: true
-# make sure the elasticsearch::unicast_hosts property is updated if master
-# eligibility is modified
diff --git a/hieradata/hosts/elastic1013.yaml b/hieradata/hosts/elastic1013.yaml
deleted file mode 100644
index 41eab79..000
--- a/hieradata/hosts/elastic1013.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-elasticsearch::master_eligible: true
-# make sure the elasticsearch::unicast_hosts property is updated if master
-# eligibility is modified
diff --git a/hieradata/hosts/elastic1001.yaml b/hieradata/hosts/elastic1030.yaml
similarity index 100%
rename from hieradata/hosts/elastic1001.yaml
rename to hieradata/hosts/elastic1030.yaml
diff --git a/hieradata/hosts/elastic1001.yaml b/hieradata/hosts/elastic1036.yaml
similarity index 100%
copy from hieradata/hosts/elastic1001.yaml
copy to hieradata/hosts/elastic1036.yaml
diff --git a/hieradata/hosts/elastic1001.yaml b/hieradata/hosts/elastic1040.yaml
similarity index 100%
copy from hieradata/hosts/elastic1001.yaml
copy to hieradata/hosts/elastic1040.yaml
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index c31960a..b50957c 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -59,7 +59,7 @@
   elasticsearch::row:  D
 
 es_eqiad_rack_d4:
-  __regex: !ruby/regexp 
/^elastic10(05|06|23|24|25|26|27|28|29|43|44|45|46|47)\.eqiad\.wmnet$/
+  __regex: !ruby/regexp 
/^elastic10(05|06|23|24|25|26|27|28|29|44|45|46|47)\.eqiad\.wmnet$/
   elasticsearch::rack: D4
   elasticsearch::row:  D
 
diff --git a/hieradata/role/eqiad/elasticsearch/server.yaml 
b/hieradata/role/eqiad/elasticsearch/server.yaml
index a343e20..e5fd413 100644
--- a/hieradata/role/eqiad/elasticsearch/server.yaml
+++ b/hieradata/role/eqiad/elasticsearch/server.yaml
@@ -5,9 +5,9 @@
 elasticsearch::multicast_group: 224.2.2.5
 elasticsearch::multicast_enabled: false
 elasticsearch::unicast_hosts: # this should be set to the list of master 
eligible nodes
-  - elastic1001.eqiad.wmnet
-  - elastic1008.eqiad.wmnet
-  - elastic1013.eqiad.wmnet
+  - elastic1030.eqiad.wmnet
+  - elastic1036.eqiad.wmnet
+  - elastic1040.eqiad.wmnet
 
 lvs::realserver::realserver_ips: "10.2.2.30"
 

-- 
To view, visit https://gerrit.wikimedia.org/r/295585
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd7e769df8dc5ad4467cfc464af88d43778fa5ba
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Moving elasticsearch masters to new servers - change (operations/puppet)

2016-06-22 Thread Gehel (Code Review) 
Gehel has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295585

Change subject: Moving elasticsearch masters to new servers
..

Moving elasticsearch masters to new servers

This is required to be able to decommission the old elasticsearch servers.

Bug: T138329
Change-Id: Idd7e769df8dc5ad4467cfc464af88d43778fa5ba
---
A hieradata/hosts/elastic1030.yaml
A hieradata/hosts/elastic1036.yaml
A hieradata/hosts/elastic1040.yaml
A hieradata/hosts/elastic1044.yaml
M hieradata/regex.yaml
M hieradata/role/eqiad/elasticsearch/server.yaml
6 files changed, 17 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/295585/1

diff --git a/hieradata/hosts/elastic1030.yaml b/hieradata/hosts/elastic1030.yaml
new file mode 100644
index 000..41eab79
--- /dev/null
+++ b/hieradata/hosts/elastic1030.yaml
@@ -0,0 +1,3 @@
+elasticsearch::master_eligible: true
+# make sure the elasticsearch::unicast_hosts property is updated if master
+# eligibility is modified
diff --git a/hieradata/hosts/elastic1036.yaml b/hieradata/hosts/elastic1036.yaml
new file mode 100644
index 000..41eab79
--- /dev/null
+++ b/hieradata/hosts/elastic1036.yaml
@@ -0,0 +1,3 @@
+elasticsearch::master_eligible: true
+# make sure the elasticsearch::unicast_hosts property is updated if master
+# eligibility is modified
diff --git a/hieradata/hosts/elastic1040.yaml b/hieradata/hosts/elastic1040.yaml
new file mode 100644
index 000..41eab79
--- /dev/null
+++ b/hieradata/hosts/elastic1040.yaml
@@ -0,0 +1,3 @@
+elasticsearch::master_eligible: true
+# make sure the elasticsearch::unicast_hosts property is updated if master
+# eligibility is modified
diff --git a/hieradata/hosts/elastic1044.yaml b/hieradata/hosts/elastic1044.yaml
new file mode 100644
index 000..41eab79
--- /dev/null
+++ b/hieradata/hosts/elastic1044.yaml
@@ -0,0 +1,3 @@
+elasticsearch::master_eligible: true
+# make sure the elasticsearch::unicast_hosts property is updated if master
+# eligibility is modified
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index c31960a..b50957c 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -59,7 +59,7 @@
   elasticsearch::row:  D
 
 es_eqiad_rack_d4:
-  __regex: !ruby/regexp 
/^elastic10(05|06|23|24|25|26|27|28|29|43|44|45|46|47)\.eqiad\.wmnet$/
+  __regex: !ruby/regexp 
/^elastic10(05|06|23|24|25|26|27|28|29|44|45|46|47)\.eqiad\.wmnet$/
   elasticsearch::rack: D4
   elasticsearch::row:  D
 
diff --git a/hieradata/role/eqiad/elasticsearch/server.yaml 
b/hieradata/role/eqiad/elasticsearch/server.yaml
index a343e20..bc2f168 100644
--- a/hieradata/role/eqiad/elasticsearch/server.yaml
+++ b/hieradata/role/eqiad/elasticsearch/server.yaml
@@ -5,9 +5,10 @@
 elasticsearch::multicast_group: 224.2.2.5
 elasticsearch::multicast_enabled: false
 elasticsearch::unicast_hosts: # this should be set to the list of master 
eligible nodes
-  - elastic1001.eqiad.wmnet
-  - elastic1008.eqiad.wmnet
-  - elastic1013.eqiad.wmnet
+  - elastic1030.eqiad.wmnet
+  - elastic1036.eqiad.wmnet
+  - elastic1040.eqiad.wmnet
+  - elastic1044.eqiad.wmnet
 
 lvs::realserver::realserver_ips: "10.2.2.30"
 

-- 
To view, visit https://gerrit.wikimedia.org/r/295585
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd7e769df8dc5ad4467cfc464af88d43778fa5ba
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits