Ottomata has submitted this change and it was merged.

Change subject: Add analytics1050-1052, analytics1054-1056 as Hadoop worker 
nodes
......................................................................


Add analytics1050-1052, analytics1054-1056 as Hadoop worker nodes

Change-Id: I23161c3e94d0382b926ab3c0d3a12b74c9826487
---
M manifests/site.pp
M templates/hadoop/net-topology.py.erb
2 files changed, 9 insertions(+), 5 deletions(-)

Approvals:
  Ottomata: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index 96edbbc..8a817bb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -114,13 +114,13 @@
 }
 
 # analytics1011, analytics1015-analytics1017, analytics1019,
-# analytics1028-analytics1049 are Hadoop worker nodes.
+# analytics1028-analytics1056 are Hadoop worker nodes.
 #
 # NOTE:  If you add, remove or move Hadoop nodes, you should edit
 # templates/hadoop/net-topology.py.erb to make sure the
 # hostname -> /datacenter/rack/row id is correct.  This is
 # used for Hadoop network topology awareness.
-node /analytics10(11|1[5-7]|19|2[89]|3[0-9]|4[0-9]).eqiad.wmnet/ {
+node /analytics10(11|1[5-7]|19|2[89]|3[0-9]|4[0-9]|5[012456]).eqiad.wmnet/ {
 
     role analytics::hadoop::worker, analytics::impala::worker
 
diff --git a/templates/hadoop/net-topology.py.erb 
b/templates/hadoop/net-topology.py.erb
index cb6eed9..0e4e510 100755
--- a/templates/hadoop/net-topology.py.erb
+++ b/templates/hadoop/net-topology.py.erb
@@ -15,9 +15,6 @@
     'analytics1001.eqiad.wmnet':  '/eqiad/C/4',
     'analytics1002.eqiad.wmnet':  '/eqiad/D/2',
 
-    'analytics1004.eqiad.wmnet':  '/eqiad/B/3',
-    'analytics1010.eqiad.wmnet':  '/eqiad/B/3',
-
     'analytics1011.eqiad.wmnet':  '/eqiad/A/2',
 
     'analytics1015.eqiad.wmnet':  '/eqiad/C/7',
@@ -53,6 +50,13 @@
     'analytics1047.eqiad.wmnet':  '/eqiad/B/3',
     'analytics1048.eqiad.wmnet':  '/eqiad/B/3',
     'analytics1049.eqiad.wmnet':  '/eqiad/B/3'
+    'analytics1050.eqiad.wmnet':  '/eqiad/B/3'
+    'analytics1051.eqiad.wmnet':  '/eqiad/B/3'
+
+    'analytics1052.eqiad.wmnet':  '/eqiad/A/3',
+    'analytics1054.eqiad.wmnet':  '/eqiad/A/3',
+    'analytics1055.eqiad.wmnet':  '/eqiad/A/3',
+    'analytics1056.eqiad.wmnet':  '/eqiad/A/3',
 }
 
 if len(argv) < 2:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23161c3e94d0382b926ab3c0d3a12b74c9826487
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to