Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: hiera: convert eqiad as well
......................................................................
hiera: convert eqiad as well
Change-Id: I06998c0fe9e5db317155aac8720c3a09ea787176
---
M hieradata/eqiad/cdh/hadoop.yaml
M hieradata/eqiad/cdh/hadoop/users.yaml
M hieradata/eqiad/cdh/hive.yaml
M hieradata/eqiad/cdh/hive/metastore.yaml
M hieradata/eqiad/cdh/hive/server.yaml
M hieradata/eqiad/cdh/hue.yaml
M hieradata/eqiad/cdh/oozie.yaml
M hieradata/eqiad/cdh/oozie/server.yaml
M hieradata/eqiad/confd.yaml
M hieradata/eqiad/druid.yaml
M hieradata/eqiad/druid/broker.yaml
M hieradata/eqiad/druid/coordinator.yaml
M hieradata/eqiad/druid/historical.yaml
M hieradata/eqiad/druid/middlemanager.yaml
M hieradata/eqiad/druid/overlord.yaml
M hieradata/eqiad/mediawiki/jobrunner.yaml
M hieradata/eqiad/openstack/nova/compute.yaml
M hieradata/eqiad/puppetmaster/config.yaml
M hieradata/eqiad/swift.yaml
M hieradata/eqiad/swift/params.yaml
M hieradata/eqiad/swift/proxy.yaml
21 files changed, 57 insertions(+), 57 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/eqiad/cdh/hadoop.yaml b/hieradata/eqiad/cdh/hadoop.yaml
index 8d0340c..39c9879 100644
--- a/hieradata/eqiad/cdh/hadoop.yaml
+++ b/hieradata/eqiad/cdh/hadoop.yaml
@@ -2,20 +2,20 @@
# Analytics Cluster Hadoop Configuration
#
-cluster_name: analytics-hadoop
+cdh::hadoop::cluster_name: analytics-hadoop
-namenode_hosts:
+cdh::hadoop::namenode_hosts:
- analytics1001.eqiad.wmnet
- analytics1002.eqiad.wmnet
-journalnode_hosts:
+cdh::hadoop::journalnode_hosts:
- analytics1052.eqiad.wmnet # Row A3
- analytics1028.eqiad.wmnet # Row C2
- analytics1035.eqiad.wmnet # Row D2
# analytics* Dell R720s have mounts on disks sdb - sdm.
# (sda is hardware raid on the 2 2.5 drives in the flex bays.)
-datanode_mounts:
+cdh::hadoop::datanode_mounts:
- /var/lib/hadoop/data/b
- /var/lib/hadoop/data/c
- /var/lib/hadoop/data/d
@@ -29,14 +29,14 @@
- /var/lib/hadoop/data/l
- /var/lib/hadoop/data/m
-net_topology_script_template:
'role/analytics_cluster/hadoop/net-topology.py.erb'
+cdh::hadoop::net_topology_script_template:
'role/analytics_cluster/hadoop/net-topology.py.erb'
# Increase NameNode heapsize independent from other daemons
-hadoop_namenode_opts: "-Xmx4096m"
+cdh::hadoop::hadoop_namenode_opts: "-Xmx4096m"
-mapreduce_reduce_shuffle_parallelcopies: 10
-mapreduce_task_io_sort_mb: 200
-mapreduce_task_io_sort_factor: 10
+cdh::hadoop::mapreduce_reduce_shuffle_parallelcopies: 10
+cdh::hadoop::mapreduce_task_io_sort_mb: 200
+cdh::hadoop::mapreduce_task_io_sort_factor: 10
# Configure memory based on these recommendations and then adjusted:
#
http://docs.hortonworks.com/HDPDocuments/HDP2/HDP-2.0.6.0/bk_installing_manually_book/content/rpm-chap1-11.html
@@ -53,25 +53,25 @@
#
# Map container size and JVM max heap size (-XmX)
-mapreduce_map_memory_mb: 2048
-mapreduce_map_java_opts: -Xmx1638m # 0.8 * 2G
+cdh::hadoop::mapreduce_map_memory_mb: 2048
+cdh::hadoop::mapreduce_map_java_opts: -Xmx1638m # 0.8 * 2G
# Reduce container size and JVM max heap size (-Xmx)
-mapreduce_reduce_memory_mb: 4096 # 2 * 2G
-mapreduce_reduce_java_opts: -Xmx3276m # 0.8 * 2 * 2G
+cdh::hadoop::mapreduce_reduce_memory_mb: 4096 # 2 * 2G
+cdh::hadoop::mapreduce_reduce_java_opts: -Xmx3276m # 0.8 * 2
* 2G
# This is the heap zize of YARN daemons ResourceManager and NodeManagers.
# This setting is used to configure the max heap size for both.
# The default is 1000m, we increase it to 2048m in production.
-yarn_heapsize: 2048
+cdh::hadoop::yarn_heapsize: 2048
# Heap size for HDFS datanode.
# The default is 1000m, we increase it to 2048m in production.
-hadoop_heapsize: 2048
+cdh::hadoop::hadoop_heapsize: 2048
# Yarn ApplicationMaster container size and max heap size (-Xmx)
-yarn_app_mapreduce_am_resource_mb: 4096 # 2 * 2G
-yarn_app_mapreduce_am_command_opts: -Xmx3276m # 0.8 * 2 * 2G
+cdh::hadoop::yarn_app_mapreduce_am_resource_mb: 4096 # 2 * 2G
+cdh::hadoop::yarn_app_mapreduce_am_command_opts: -Xmx3276m # 0.8 * 2
* 2G
# Save 8G for OS and other processes.
# Memory available for use by Hadoop jobs: 64G - 8G == 56G.
@@ -80,12 +80,12 @@
# This is the total amount of memory that NodeManagers
# will use for allocation to containers.
-yarn_nodemanager_resource_memory_mb: 57344 # 64G - 8G
+cdh::hadoop::yarn_nodemanager_resource_memory_mb: 57344 # 64G - 8G
# Setting _minimum_allocation_mb to 0 to allow Impala to submit small
# reservation requests.
-yarn_scheduler_minimum_allocation_mb: 0
-yarn_scheduler_maximum_allocation_mb: 57344
+cdh::hadoop::yarn_scheduler_minimum_allocation_mb: 0
+cdh::hadoop::yarn_scheduler_maximum_allocation_mb: 57344
# Setting minimum_allocation_vcores to 0 to allow Impala to submit small
# reservation requests.
-yarn_scheduler_minimum_allocation_vcores: 0
+cdh::hadoop::yarn_scheduler_minimum_allocation_vcores: 0
diff --git a/hieradata/eqiad/cdh/hadoop/users.yaml
b/hieradata/eqiad/cdh/hadoop/users.yaml
index 24a233a..fd51433 100644
--- a/hieradata/eqiad/cdh/hadoop/users.yaml
+++ b/hieradata/eqiad/cdh/hadoop/users.yaml
@@ -1,2 +1,2 @@
# Ensure that users in these posix groups have home directories in HDFS.
-groups: "analytics-users analytics-privatedata-users analytics-admins
analytics-search-users"
+cdh::hadoop::users::groups: "analytics-users analytics-privatedata-users
analytics-admins analytics-search-users"
diff --git a/hieradata/eqiad/cdh/hive.yaml b/hieradata/eqiad/cdh/hive.yaml
index e5506f2..ec1e1f5 100644
--- a/hieradata/eqiad/cdh/hive.yaml
+++ b/hieradata/eqiad/cdh/hive.yaml
@@ -1,8 +1,8 @@
#
# Analytics Cluster Hive Configuration
#
-metastore_host: analytics1003.eqiad.wmnet
+cdh::hive::metastore_host: analytics1003.eqiad.wmnet
# The WMF webrequest table uses HCatalog's JSON Serde.
# Automatically include this in Hive client classpaths.
-auxpath: file:///usr/lib/hive-hcatalog/share/hcatalog/hive-hcatalog-core.jar
+cdh::hive::auxpath:
file:///usr/lib/hive-hcatalog/share/hcatalog/hive-hcatalog-core.jar
diff --git a/hieradata/eqiad/cdh/hive/metastore.yaml
b/hieradata/eqiad/cdh/hive/metastore.yaml
index 583d01d..6f7e1ea 100644
--- a/hieradata/eqiad/cdh/hive/metastore.yaml
+++ b/hieradata/eqiad/cdh/hive/metastore.yaml
@@ -1,4 +1,4 @@
#
# Following Cloudera recommandations for ~20 users
#
-heapsize: 10240
+cdh::hive::metastore::heapsize: 10240
diff --git a/hieradata/eqiad/cdh/hive/server.yaml
b/hieradata/eqiad/cdh/hive/server.yaml
index bfdab39..1aadbda 100644
--- a/hieradata/eqiad/cdh/hive/server.yaml
+++ b/hieradata/eqiad/cdh/hive/server.yaml
@@ -1,4 +1,4 @@
#
# Following Cloudera recommandations for ~20 users
#
-heapsize: 6144
+cdh::hive::server::heapsize: 6144
diff --git a/hieradata/eqiad/cdh/hue.yaml b/hieradata/eqiad/cdh/hue.yaml
index 40e9035..f6b8a7b 100644
--- a/hieradata/eqiad/cdh/hue.yaml
+++ b/hieradata/eqiad/cdh/hue.yaml
@@ -3,11 +3,11 @@
#
# Don't auto create Hue users from LDAP in production.
-ldap_create_users_on_login: false
+cdh::hue::ldap_create_users_on_login: false
# External Database configuration
-database_host: 'analytics1003.eqiad.wmnet'
-database_engine: 'mysql'
-database_user: 'hue'
-database_port: '3306'
-database_name: 'hue'
\ No newline at end of file
+cdh::hue::database_host: 'analytics1003.eqiad.wmnet'
+cdh::hue::database_engine: 'mysql'
+cdh::hue::database_user: 'hue'
+cdh::hue::database_port: '3306'
+cdh::hue::database_name: 'hue'
\ No newline at end of file
diff --git a/hieradata/eqiad/cdh/oozie.yaml b/hieradata/eqiad/cdh/oozie.yaml
index b0377ff..3f1fb38 100644
--- a/hieradata/eqiad/cdh/oozie.yaml
+++ b/hieradata/eqiad/cdh/oozie.yaml
@@ -2,4 +2,4 @@
# Analytics Cluster Oozie Configuration
#
-oozie_host: analytics1003.eqiad.wmnet
\ No newline at end of file
+cdh::oozie::oozie_host: analytics1003.eqiad.wmnet
\ No newline at end of file
diff --git a/hieradata/eqiad/cdh/oozie/server.yaml
b/hieradata/eqiad/cdh/oozie/server.yaml
index 6ac8fa0..e43a455 100644
--- a/hieradata/eqiad/cdh/oozie/server.yaml
+++ b/hieradata/eqiad/cdh/oozie/server.yaml
@@ -1 +1 @@
-heapsize: 2048
+cdh::oozie::server::heapsize: 2048
diff --git a/hieradata/eqiad/confd.yaml b/hieradata/eqiad/confd.yaml
index 0d533b3..e213ac2 100644
--- a/hieradata/eqiad/confd.yaml
+++ b/hieradata/eqiad/confd.yaml
@@ -1 +1 @@
-srv_dns: 'eqiad.wmnet'
+confd::srv_dns: 'eqiad.wmnet'
diff --git a/hieradata/eqiad/druid.yaml b/hieradata/eqiad/druid.yaml
index 20cd340..f5f1408 100644
--- a/hieradata/eqiad/druid.yaml
+++ b/hieradata/eqiad/druid.yaml
@@ -1,5 +1,5 @@
-use_cdh: true
-properties:
+druid::use_cdh: true
+druid::properties:
druid.metadata.storage.type: mysql
druid.metadata.storage.connector.host: analytics1003.eqiad.wmnet
# druid.metadata.storage.connector.password is set in
diff --git a/hieradata/eqiad/druid/broker.yaml
b/hieradata/eqiad/druid/broker.yaml
index eb03871..9e8625d 100644
--- a/hieradata/eqiad/druid/broker.yaml
+++ b/hieradata/eqiad/druid/broker.yaml
@@ -1,10 +1,10 @@
-properties:
+druid::broker::properties:
druid.processing.numThreads: 10
druid.processing.buffer.sizeBytes: 2147483647
druid.server.http.numThreads: 20
druid.broker.http.numConnections: 20
druid.broker.http.readTimeout: PT5M
-env:
+druid::broker::env:
DRUID_HEAP_OPTS: "-Xmx25g -Xms25g"
DRUID_EXTRA_JVM_OPTS: "-XX:NewSize=6g -XX:MaxNewSize=6g
-XX:MaxDirectMemorySize=64g -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails
-XX:+PrintGCTimeStamps"
diff --git a/hieradata/eqiad/druid/coordinator.yaml
b/hieradata/eqiad/druid/coordinator.yaml
index 2135069..d9cad36 100644
--- a/hieradata/eqiad/druid/coordinator.yaml
+++ b/hieradata/eqiad/druid/coordinator.yaml
@@ -1,3 +1,3 @@
-env:
+druid::coordinator::env:
DRUID_HEAP_OPTS: "-Xmx10g -Xms10g"
DRUID_EXTRA_JVM_OPTS: "-XX:NewSize=512m -XX:MaxNewSize=512m -XX:+UseG1GC
-XX:+PrintGCDetails -XX:+PrintGCTimeStamps"
diff --git a/hieradata/eqiad/druid/historical.yaml
b/hieradata/eqiad/druid/historical.yaml
index 3b55d69..3b5acca 100644
--- a/hieradata/eqiad/druid/historical.yaml
+++ b/hieradata/eqiad/druid/historical.yaml
@@ -1,4 +1,4 @@
-properties:
+druid::historical::properties:
druid.processing.numThreads: 10
druid.processing.buffer.sizeBytes: 1073741824
druid.server.http.numThreads: 20
@@ -7,6 +7,6 @@
druid.historical.cache.useCache: true
druid.historical.cache.populateCache: true
-env:
+druid::historical::env:
DRUID_HEAP_OPTS: "-Xmx12g -Xms12g"
DRUID_EXTRA_JVM_OPTS: "-XX:NewSize=6g -XX:MaxNewSize=6g
-XX:MaxDirectMemorySize=32g -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails
-XX:+PrintGCTimeStamps"
diff --git a/hieradata/eqiad/druid/middlemanager.yaml
b/hieradata/eqiad/druid/middlemanager.yaml
index 3284694..1253682 100644
--- a/hieradata/eqiad/druid/middlemanager.yaml
+++ b/hieradata/eqiad/druid/middlemanager.yaml
@@ -1,4 +1,4 @@
-properties:
+druid::middlemanager::properties:
druid.worker.ip: "%{::fqdn}"
druid.worker.capacity: 12
druid.processing.numThreads: 3
@@ -7,6 +7,6 @@
druid.indexer.runner.javaOpts: "-server -Xmx2g -XX:+UseG1GC
-XX:MaxGCPauseMillis=100 -XX:+PrintGCDetails -XX:+PrintGCTimeStamps
-Dhadoop.mapreduce.job.user.classpath.first=true"
druid.indexer.task.defaultHadoopCoordinates:
["org.apache.hadoop:hadoop-client:cdh"]
-env:
+druid::middlemanager::env:
DRUID_HEAP_OPTS: "-Xmx64m -Xms64m"
DRUID_EXTRA_JVM_OPTS: "-XX:+UseConcMarkSweepGC -XX:+PrintGCDetails
-XX:+PrintGCTimeStamps"
diff --git a/hieradata/eqiad/druid/overlord.yaml
b/hieradata/eqiad/druid/overlord.yaml
index dbac08a..b53eee0 100644
--- a/hieradata/eqiad/druid/overlord.yaml
+++ b/hieradata/eqiad/druid/overlord.yaml
@@ -1,7 +1,7 @@
-properties:
+druid::overlord::properties:
druid.indexer.runner.type: remote
druid.indexer.storage.type: metadata
-env:
+druid::overlord::env:
DRUID_HEAP_OPTS: "-Xmx4g -Xms4g"
DRUID_EXTRA_JVM_OPTS: "-XX:NewSize=256m -XX:MaxNewSize=256m
-XX:+UseConcMarkSweepGC -XX:+PrintGCDetails -XX:+PrintGCTimeStamps"
diff --git a/hieradata/eqiad/mediawiki/jobrunner.yaml
b/hieradata/eqiad/mediawiki/jobrunner.yaml
index a0badd6..920236d 100644
--- a/hieradata/eqiad/mediawiki/jobrunner.yaml
+++ b/hieradata/eqiad/mediawiki/jobrunner.yaml
@@ -1,4 +1,4 @@
-queue_servers:
+mediawiki::jobrunner::queue_servers:
- rdb1001.eqiad.wmnet
- rdb1001.eqiad.wmnet:6380
- rdb1001.eqiad.wmnet:6381
@@ -11,9 +11,9 @@
- rdb1007.eqiad.wmnet
- rdb1007.eqiad.wmnet:6380
- rdb1007.eqiad.wmnet:6381
-aggr_servers:
+mediawiki::jobrunner::aggr_servers:
- rdb1001.eqiad.wmnet:6378
- rdb1003.eqiad.wmnet:6378
- rdb1005.eqiad.wmnet:6378
- rdb1007.eqiad.wmnet:6378
-statsd_server: statsd.eqiad.wmnet:8125
+mediawiki::jobrunner::statsd_server: statsd.eqiad.wmnet:8125
diff --git a/hieradata/eqiad/openstack/nova/compute.yaml
b/hieradata/eqiad/openstack/nova/compute.yaml
index 83dc7a2..e26b1a6 100644
--- a/hieradata/eqiad/openstack/nova/compute.yaml
+++ b/hieradata/eqiad/openstack/nova/compute.yaml
@@ -1 +1 @@
-base::monitoring::host::nrpe_check_disk_critical: true
+openstack::nova::compute::base::monitoring::host::nrpe_check_disk_critical:
true
diff --git a/hieradata/eqiad/puppetmaster/config.yaml
b/hieradata/eqiad/puppetmaster/config.yaml
index 01ecb7b..b50c421 100644
--- a/hieradata/eqiad/puppetmaster/config.yaml
+++ b/hieradata/eqiad/puppetmaster/config.yaml
@@ -1 +1 @@
-puppetdb_host: nitrogen.eqiad.wmnet
+puppetmaster::config::puppetdb_host: nitrogen.eqiad.wmnet
diff --git a/hieradata/eqiad/swift.yaml b/hieradata/eqiad/swift.yaml
index d4e7f17..fe5fcb3 100644
--- a/hieradata/eqiad/swift.yaml
+++ b/hieradata/eqiad/swift.yaml
@@ -1 +1 @@
-hash_path_suffix: '4f93c548a5903a13'
+swift::hash_path_suffix: '4f93c548a5903a13'
diff --git a/hieradata/eqiad/swift/params.yaml
b/hieradata/eqiad/swift/params.yaml
index c528a5e..7e14022 100644
--- a/hieradata/eqiad/swift/params.yaml
+++ b/hieradata/eqiad/swift/params.yaml
@@ -1,5 +1,5 @@
-swift_cluster: eqiad-prod
-accounts:
+swift::params::swift_cluster: eqiad-prod
+swift::params::accounts:
super_admin:
access: '.admin .reseller_admin'
account_name: 'AUTH_admin'
diff --git a/hieradata/eqiad/swift/proxy.yaml b/hieradata/eqiad/swift/proxy.yaml
index d456219..decc092 100644
--- a/hieradata/eqiad/swift/proxy.yaml
+++ b/hieradata/eqiad/swift/proxy.yaml
@@ -1,5 +1,5 @@
-proxy_service_host: 'ms-fe.svc.eqiad.wmnet'
-memcached_servers: [
+swift::proxy::proxy_service_host: 'ms-fe.svc.eqiad.wmnet'
+swift::proxy::memcached_servers: [
'ms-fe1001.eqiad.wmnet:11211',
'ms-fe1002.eqiad.wmnet:11211',
'ms-fe1003.eqiad.wmnet:11211',
@@ -7,4 +7,4 @@
# no trailing comma!
]
-thumborhost: 'thumbor.svc.eqiad.wmnet:8800'
+swift::proxy::thumborhost: 'thumbor.svc.eqiad.wmnet:8800'
--
To view, visit https://gerrit.wikimedia.org/r/315246
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I06998c0fe9e5db317155aac8720c3a09ea787176
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
