Ottomata has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/382701 )
Change subject: Install analytics_cluster hadoop client on flerovium and furud
......................................................................
Install analytics_cluster hadoop client on flerovium and furud
Temporarily allow access to Hadoop from flevorium and furud
Bug: T176505
Change-Id: Idcfb204db9381a1b59d2544d131e28236b996397
---
A hieradata/role/common/analytics_cluster/hadoop/client.yaml
M manifests/site.pp
M modules/base/templates/firewall/defs.erb
A modules/role/manifests/analytics_cluster/hadoop/client.pp
4 files changed, 19 insertions(+), 3 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, but someone else must approve
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/analytics_cluster/hadoop/client.yaml
b/hieradata/role/common/analytics_cluster/hadoop/client.yaml
new file mode 100644
index 0000000..3fa86b2
--- /dev/null
+++ b/hieradata/role/common/analytics_cluster/hadoop/client.yaml
@@ -0,0 +1,4 @@
+profile::hadoop::client::zookeeper_cluster_name: main-eqiad
+profile::hadoop::client::resourcemanager_hosts:
+ - analytics1001.eqiad.wmnet
+ - analytics1002.eqiad.wmnet
diff --git a/manifests/site.pp b/manifests/site.pp
index 7fecde2..18bf1a0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -887,12 +887,12 @@
# Backup system, see T176505
node 'flerovium.eqiad.wmnet' {
- role(spare::system)
+ role(analytics_cluster::hadoop::client)
}
# Backup system, see T176506
node 'furud.codfw.wmnet' {
- role(spare::system)
+ role(analytics_cluster::hadoop::client)
}
# Etcd cluster for kubernetes
diff --git a/modules/base/templates/firewall/defs.erb
b/modules/base/templates/firewall/defs.erb
index 3322333..c5bc227 100644
--- a/modules/base/templates/firewall/defs.erb
+++ b/modules/base/templates/firewall/defs.erb
@@ -25,7 +25,9 @@
# $FRACK_NETWORKS is meant to be a set of all fundraising networks
@def $FRACK_NETWORKS = (<%- frack_networks.each do |net| -%><%= net %> <% end
-%>);
-@def $ANALYTICS_NETWORKS = (<%- analytics_networks.each do |net| -%><%= net %>
<% end -%>);
+# Temporarily include flevorium (10.64.48.112/32) and furud (10.192.16.65/32)
+# in ANALYTICS_NETWORKS for backup purposes, see: T176506
+@def $ANALYTICS_NETWORKS = (<%- analytics_networks.each do |net| -%><%= net %>
<% end -%> 10.64.48.112/32 10.192.16.65/32 );
@def $MW_APPSERVER_NETWORKS = (<%- mw_appserver_networks.each do |net| -%><%=
net %> <% end -%>);
@def $NETWORK_INFRA = (<%- network_infra.each do |net| -%><%= net %> <% end
-%>);
diff --git a/modules/role/manifests/analytics_cluster/hadoop/client.pp
b/modules/role/manifests/analytics_cluster/hadoop/client.pp
new file mode 100644
index 0000000..52d897b
--- /dev/null
+++ b/modules/role/manifests/analytics_cluster/hadoop/client.pp
@@ -0,0 +1,10 @@
+# == Class role::analytics_cluster::hadoop::client
+# Simple role class that only includes a hadoop client.
+#
+class role::analytics_cluster::hadoop::client {
+ system::role { 'analytics_cluster::hadoop::client':
+ description => 'Hadoop client',
+ }
+
+ require ::profile::hadoop::client
+}
--
To view, visit https://gerrit.wikimedia.org/r/382701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idcfb204db9381a1b59d2544d131e28236b996397
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[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
