Elukey has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372122 )
Change subject: profile::druid::common: fix merge druid::properties ...................................................................... profile::druid::common: fix merge druid::properties In https://gerrit.wikimedia.org/r/#/c/370798 the refactoring didn't take into account that druid::properties is composed by multiple hash (private+public repo). This change will probably need a follow up but for the moment it is better to avoid massive changes to the druid module. Bug: T167790 Change-Id: I9c1813afcad417e962b355c00562225e26f30f1b --- M modules/profile/manifests/druid/common.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Elukey: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/profile/manifests/druid/common.pp b/modules/profile/manifests/druid/common.pp index 3e52095..3b0b9c3 100644 --- a/modules/profile/manifests/druid/common.pp +++ b/modules/profile/manifests/druid/common.pp @@ -12,7 +12,7 @@ class profile::druid::common( $zookeeper_cluster_name = hiera('profile::druid::common::zookeeper_cluster_name'), $zookeeper_clusters = hiera('zookeeper_clusters'), - $druid_properties = hiera('druid::properties'), + $druid_properties = hiera_hash('druid::properties'), ) { # Need Java before Druid is installed. require ::profile::java::analytics -- To view, visit https://gerrit.wikimedia.org/r/372122 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c1813afcad417e962b355c00562225e26f30f1b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey <[email protected]> Gerrit-Reviewer: Elukey <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
