Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/382684 )
Change subject: role::cache::base: convert to profile [2/2] ...................................................................... role::cache::base: convert to profile [2/2] Remove some unneded includes, other small fixes. Change-Id: Idc8ba3f51ed440de0849f41624be414eba280654 --- M modules/profile/manifests/cache/base.pp 1 file changed, 11 insertions(+), 7 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved Ema: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/profile/manifests/cache/base.pp b/modules/profile/manifests/cache/base.pp index 4329056..21cf8af 100644 --- a/modules/profile/manifests/cache/base.pp +++ b/modules/profile/manifests/cache/base.pp @@ -16,16 +16,20 @@ ) { # Needed profiles require ::profile::conftool::client - require ::profile::cache::kafka::webrequest - include ::standard + require ::standard - # Other includes - to fix - include ::nrpe - include lvs::configuration - include network::constants - include conftool::scripts + # FIXME: this cannot be required or it will cause a dependency cycle. It might be a good idea not to include it here + include ::profile::cache::kafka::webrequest + + # Globals we need to include + include ::lvs::configuration + include ::network::constants + + # TODO: this is properly a profile include ::role::prometheus::varnish_exporter + class { 'conftool::scripts': } + # Only production needs system perf tweaks if $::realm == 'production' { include role::cache::perf -- To view, visit https://gerrit.wikimedia.org/r/382684 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc8ba3f51ed440de0849f41624be414eba280654 Gerrit-PatchSet: 8 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Ema <e...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Zoranzoki21 <zorandori4...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits