Ottomata has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/405021 )
Change subject: Add druid defaults for easier setup in Cloud VPS
......................................................................
Add druid defaults for easier setup in Cloud VPS
Should be no-op in prod.
Change-Id: I211a795b2acde192a090e89976ccd9ad3ce8d1a0
---
M modules/profile/manifests/druid/broker.pp
M modules/profile/manifests/druid/common.pp
M modules/profile/manifests/druid/coordinator.pp
M modules/profile/manifests/druid/historical.pp
M modules/profile/manifests/druid/middlemanager.pp
M modules/profile/manifests/druid/overlord.pp
6 files changed, 29 insertions(+), 29 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/profile/manifests/druid/broker.pp
b/modules/profile/manifests/druid/broker.pp
index 7ab39a4..6a799e2 100644
--- a/modules/profile/manifests/druid/broker.pp
+++ b/modules/profile/manifests/druid/broker.pp
@@ -6,11 +6,11 @@
# haver finer control over how Druid accepts queries.
#
class profile::druid::broker(
- $properties = hiera('profile::druid::broker::properties'),
- $env = hiera('profile::druid::broker::env'),
- $ferm_srange = hiera('profile::druid::broker::ferm_srange'),
- $daemon_autoreload = hiera('profile::druid::daemons_autoreload'),
- $monitoring_enabled = hiera('profile::druid::broker::monitoring_enabled'),
+ $properties = hiera('profile::druid::broker::properties', {}),
+ $env = hiera('profile::druid::broker::env', {}),
+ $ferm_srange = hiera('profile::druid::broker::ferm_srange',
'$DOMAIN_NETWORKS'),
+ $daemon_autoreload = hiera('profile::druid::daemons_autoreload', true),
+ $monitoring_enabled = hiera('profile::druid::broker::monitoring_enabled',
false),
) {
require ::profile::druid::common
diff --git a/modules/profile/manifests/druid/common.pp
b/modules/profile/manifests/druid/common.pp
index 59a88d4..864977d 100644
--- a/modules/profile/manifests/druid/common.pp
+++ b/modules/profile/manifests/druid/common.pp
@@ -12,11 +12,11 @@
class profile::druid::common(
$druid_cluster_name =
hiera('profile::druid::common::druid_cluster_name'),
$zookeeper_cluster_name =
hiera('profile::druid::common::zookeeper_cluster_name'),
- $private_properties =
hiera('profile::druid::common::private_properties'),
- $properties =
hiera('profile::druid::common::properties'),
+ $private_properties =
hiera('profile::druid::common::private_properties', {}),
+ $properties =
hiera('profile::druid::common::properties', {}),
$zookeeper_clusters = hiera('zookeeper_clusters'),
- $metadata_storage_database_name =
hiera('profile::druid::common:metadata_storage_database_name'),
- $use_cdh = hiera('profile::druid::common::use_cdh'),
+ $metadata_storage_database_name =
hiera('profile::druid::common:metadata_storage_database_name', 'druid'),
+ $use_cdh = hiera('profile::druid::common::use_cdh',
false),
) {
# Need Java before Druid is installed.
require ::profile::java::analytics
diff --git a/modules/profile/manifests/druid/coordinator.pp
b/modules/profile/manifests/druid/coordinator.pp
index 67ce71a..01e2efa 100644
--- a/modules/profile/manifests/druid/coordinator.pp
+++ b/modules/profile/manifests/druid/coordinator.pp
@@ -6,11 +6,11 @@
# haver finer control over how Druid accepts queries.
#
class profile::druid::coordinator(
- $properties = hiera('profile::druid::coordinator::properties'),
- $env = hiera('profile::druid::coordinator::env'),
- $daemon_autoreload = hiera('profile::druid::daemons_autoreload'),
- $ferm_srange = hiera('profile::druid::coordinator::ferm_srange'),
- $monitoring_enabled =
hiera('profile::druid::coordinator::monitoring_enabled'),
+ $properties = hiera('profile::druid::coordinator::properties', {}),
+ $env = hiera('profile::druid::coordinator::env', {}),
+ $daemon_autoreload = hiera('profile::druid::daemons_autoreload', true),
+ $ferm_srange = hiera('profile::druid::coordinator::ferm_srange',
'$DOMAIN_NETWORKS'),
+ $monitoring_enabled =
hiera('profile::druid::coordinator::monitoring_enabled', false),
) {
require ::profile::druid::common
diff --git a/modules/profile/manifests/druid/historical.pp
b/modules/profile/manifests/druid/historical.pp
index 1663278..e9fd88e 100644
--- a/modules/profile/manifests/druid/historical.pp
+++ b/modules/profile/manifests/druid/historical.pp
@@ -1,11 +1,11 @@
# Class: profile::druid::historical
#
class profile::druid::historical(
- $properties = hiera('profile::druid::historical::properties'),
- $env = hiera('profile::druid::historical::env'),
- $daemon_autoreload = hiera('profile::druid::daemons_autoreload'),
- $ferm_srange = hiera('profile::druid::ferm_srange'),
- $monitoring_enabled =
hiera('profile::druid::historical::monitoring_enabled'),
+ $properties = hiera('profile::druid::historical::properties', {}),
+ $env = hiera('profile::druid::historical::env', {}),
+ $daemon_autoreload = hiera('profile::druid::daemons_autoreload', true),
+ $ferm_srange = hiera('profile::druid::ferm_srange',
'$DOMAIN_NETWORKS'),
+ $monitoring_enabled =
hiera('profile::druid::historical::monitoring_enabled', false),
) {
require ::profile::druid::common
diff --git a/modules/profile/manifests/druid/middlemanager.pp
b/modules/profile/manifests/druid/middlemanager.pp
index ec60228..9b718b2 100644
--- a/modules/profile/manifests/druid/middlemanager.pp
+++ b/modules/profile/manifests/druid/middlemanager.pp
@@ -1,11 +1,11 @@
# Class: profile::druid::middlemanager
#
class profile::druid::middlemanager(
- $properties = hiera('profile::druid::middlemanager::properties'),
- $env = hiera('profile::druid::middlemanager::env'),
- $daemon_autoreload = hiera('profile::druid::daemons_autoreload'),
- $ferm_srange = hiera('profile::druid::ferm_srange'),
- $monitoring_enabled =
hiera('profile::druid::middlemanager::monitoring_enabled'),
+ $properties = hiera('profile::druid::middlemanager::properties',
{}),
+ $env = hiera('profile::druid::middlemanager::env', {}),
+ $daemon_autoreload = hiera('profile::druid::daemons_autoreload', true),
+ $ferm_srange = hiera('profile::druid::ferm_srange',
'$DOMAIN_NETWORKS'),
+ $monitoring_enabled =
hiera('profile::druid::middlemanager::monitoring_enabled', false),
) {
require ::profile::druid::common
diff --git a/modules/profile/manifests/druid/overlord.pp
b/modules/profile/manifests/druid/overlord.pp
index 3793b07..bf64660 100644
--- a/modules/profile/manifests/druid/overlord.pp
+++ b/modules/profile/manifests/druid/overlord.pp
@@ -6,11 +6,11 @@
# haver finer control over how Druid accepts indexing tasks.
#
class profile::druid::overlord(
- $properties = hiera('profile::druid::overlord::properties'),
- $env = hiera('profile::druid::overlord::env'),
- $ferm_srange = hiera('profile::druid::overlord::ferm_srange'),
- $daemon_autoreload = hiera('profile::druid::daemons_autoreload'),
- $monitoring_enabled =
hiera('profile::druid::overlord::monitoring_enabled'),
+ $properties = hiera('profile::druid::overlord::properties', {}),
+ $env = hiera('profile::druid::overlord::env', {}),
+ $ferm_srange = hiera('profile::druid::overlord::ferm_srange',
'$DOMAIN_NETWORKS'),
+ $daemon_autoreload = hiera('profile::druid::daemons_autoreload', true),
+ $monitoring_enabled =
hiera('profile::druid::overlord::monitoring_enabled', false),
) {
require ::profile::druid::common
--
To view, visit https://gerrit.wikimedia.org/r/405021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I211a795b2acde192a090e89976ccd9ad3ce8d1a0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <ao...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Ottomata <ao...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
