848824 - buildbot master in PuppetAgain requires some configuration in nodes.pp

Status: RESOLVED DUPLICATE of bug 891859

(Infrastructure & Operations :: RelOps: Puppet, task)

Description

[Massimo Gervasini [:massimo]]

A part of buildbot master configuration is in node.pp  
According to the discussion on porting buildbot master to PuppetAgain (bug: 803823), it should be removed.

for more information: 
803823 Comment #3 (https://bugzilla.mozilla.org/show_bug.cgi?id=803823#c3)
...
Specifying per-host configuration in the node definition is a change from how we've decided to do things.  From https://wiki.mozilla.org/ReleaseEngineering/PuppetAgain:

"In anticipation of using an external node classifier (ENC), node definitions should only include classes - do not define any resources within nodes. In general, the included classes should be in the toplevel module. "

Nothing's carved in stone, of course, but we should think carefully before changing that.  As I understand it, this information is already redundant to information in production-masters.json, etc.  Could it be generated dynamically from that file somehow?  Perhaps with some Ruby DSL?

Alternately, the class invocations here could be moved to a case $::fqdn { .. } statement in the toplevel::server::buildmaster class.

803823 Comment #4 (https://bugzilla.mozilla.org/show_bug.cgi?id=803823#c4)
...
I agree, we need something here what would prevent us duplicating information. We can use "case $::fqdn..." as an intermediate step here before we switch to using production-masters.json (not trivial, deserves a separate bug).

Comment 1

[Rail Aliiev [:rail]]

Dustin, do you have any ideas here? Is the bug still valid?

Comment 2

[Dustin J. Mitchell [:dustin] (he/him)]

Yes, we need to find a way to move the buildmaster info out of nodes.pp, so the buildmasters just have 

  include toplevel::server::buildmaster

This can probably be generated -- as I'm quoted as saying above -- from production-masters.json.