Ottomata has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/382705 )
Change subject: Bring back hadoop::client role, move cdh module hiera to common
......................................................................
Bring back hadoop::client role, move cdh module hiera to common
This didn't work before because I needed to
1. include ::standard
2. Have cdh module level hiera available to codfw as well as eqiad
This reverts commit ec61cc070a947a670b74fbd9877e9615ea362804.
Change-Id: I28fb3b83a7afea70100126e1eeaf8b37c9f13b53
---
R hieradata/common/cdh/hadoop.yaml
R hieradata/common/cdh/hadoop/users.yaml
R hieradata/common/cdh/hive.yaml
R hieradata/common/cdh/hue.yaml
R hieradata/common/cdh/oozie.yaml
R hieradata/common/cdh/oozie/server.yaml
A hieradata/role/common/analytics_cluster/hadoop/client.yaml
M manifests/site.pp
A modules/role/manifests/analytics_cluster/hadoop/client.pp
9 files changed, 20 insertions(+), 2 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/eqiad/cdh/hadoop.yaml b/hieradata/common/cdh/hadoop.yaml
similarity index 100%
rename from hieradata/eqiad/cdh/hadoop.yaml
rename to hieradata/common/cdh/hadoop.yaml
diff --git a/hieradata/eqiad/cdh/hadoop/users.yaml
b/hieradata/common/cdh/hadoop/users.yaml
similarity index 100%
rename from hieradata/eqiad/cdh/hadoop/users.yaml
rename to hieradata/common/cdh/hadoop/users.yaml
diff --git a/hieradata/eqiad/cdh/hive.yaml b/hieradata/common/cdh/hive.yaml
similarity index 100%
rename from hieradata/eqiad/cdh/hive.yaml
rename to hieradata/common/cdh/hive.yaml
diff --git a/hieradata/eqiad/cdh/hue.yaml b/hieradata/common/cdh/hue.yaml
similarity index 100%
rename from hieradata/eqiad/cdh/hue.yaml
rename to hieradata/common/cdh/hue.yaml
diff --git a/hieradata/eqiad/cdh/oozie.yaml b/hieradata/common/cdh/oozie.yaml
similarity index 100%
rename from hieradata/eqiad/cdh/oozie.yaml
rename to hieradata/common/cdh/oozie.yaml
diff --git a/hieradata/eqiad/cdh/oozie/server.yaml
b/hieradata/common/cdh/oozie/server.yaml
similarity index 100%
rename from hieradata/eqiad/cdh/oozie/server.yaml
rename to hieradata/common/cdh/oozie/server.yaml
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 63ab48d..fbf7ddc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -887,12 +887,16 @@
# Backup system, see T176505
node 'flerovium.eqiad.wmnet' {
- role(analytics_cluster::client)
+ role(analytics_cluster::hadoop::client)
+
+ include ::standard
}
# Backup system, see T176506
node 'furud.codfw.wmnet' {
- role(analytics_cluster::client)
+ role(analytics_cluster::hadoop::client)
+
+ include ::standard
}
# Etcd cluster for kubernetes
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/382705
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28fb3b83a7afea70100126e1eeaf8b37c9f13b53
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[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
