Faidon Liambotis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404441 )
Change subject: Rename role pmacct to netinsights ...................................................................... Rename role pmacct to netinsights ...and add the base kafkatee class to it. Needs further cleanup, as that kafkatee class was following our previous role-based pattern instead of a profile, which makes this a role-includes-role anti-pattern. Change-Id: I08c7c6fc4484e25e66c6576a2782a500b54c75a0 --- M manifests/site.pp A modules/role/manifests/netinsights.pp D modules/role/manifests/pmacct.pp 3 files changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/41/404441/1 diff --git a/manifests/site.pp b/manifests/site.pp index 1f83f6a..57b6948 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1872,7 +1872,7 @@ # network insights (netflow/pmacct, etc.) node 'rhenium.wikimedia.org' { - role(pmacct) + role(netinsights) } # Failoid service (Ganeti VM) diff --git a/modules/role/manifests/netinsights.pp b/modules/role/manifests/netinsights.pp new file mode 100644 index 0000000..8bfcf5a --- /dev/null +++ b/modules/role/manifests/netinsights.pp @@ -0,0 +1,8 @@ +# +class role::netinsights { + include ::profile::base::firewall + include ::profile::pmacct + + # TODO: this needs to become a profile, obviously + include ::role::logging::kafkatee::webrequest::base +} diff --git a/modules/role/manifests/pmacct.pp b/modules/role/manifests/pmacct.pp deleted file mode 100644 index 7a96853..0000000 --- a/modules/role/manifests/pmacct.pp +++ /dev/null @@ -1,5 +0,0 @@ -# -class role::pmacct { - include ::profile::base::firewall - include ::profile::pmacct -} -- To view, visit https://gerrit.wikimedia.org/r/404441 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08c7c6fc4484e25e66c6576a2782a500b54c75a0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits