Faidon has submitted this change and it was merged. Change subject: authdns: fix puppet evaluation order ......................................................................
authdns: fix puppet evaluation order Fix the evaluation order of authdns/authdns::monitoring. A class dependency doesn't gurantee that and there's no construct to achieve this, so instead inline this in the main init.pp. It's also more DRY like that :) Change-Id: I71d5fdbfbcf5910924ebf1c782a98331423077b2 --- M manifests/role/authdns.pp M modules/authdns/manifests/init.pp 2 files changed, 5 insertions(+), 1 deletion(-) Approvals: Faidon: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/authdns.pp b/manifests/role/authdns.pp index f01ec72..cc0e270 100644 --- a/manifests/role/authdns.pp +++ b/manifests/role/authdns.pp @@ -12,7 +12,6 @@ ] $gitrepo = 'https://gerrit.wikimedia.org/r/p/operations/dns.git' - include authdns::monitoring include authdns::ganglia } diff --git a/modules/authdns/manifests/init.pp b/modules/authdns/manifests/init.pp index 5bd4b01..4c9f9a4 100644 --- a/modules/authdns/manifests/init.pp +++ b/modules/authdns/manifests/init.pp @@ -7,6 +7,7 @@ $ipaddress = undef, $ipaddress6 = undef, $gitrepo = undef, + $monitoring = true, ) { require authdns::account require authdns::scripts @@ -87,6 +88,10 @@ before => Package['gdnsd'], } + if $monitoring { + include authdns::monitoring + } + # export the SSH host key for service hostname/IP keys too if $fqdn != $::fqdn { @@sshkey { $fqdn: -- To view, visit https://gerrit.wikimedia.org/r/80369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I71d5fdbfbcf5910924ebf1c782a98331423077b2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon <fai...@wikimedia.org> Gerrit-Reviewer: Faidon <fai...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits