758479 - move Mozilla settings to moco-config.csv, get some settings from infra puppet

Status: RESOLVED FIXED

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

Description

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

Right now we're putting some Mozilla-specific settings in default-settings.csv, which doesn't feel right.  Instead, we should have a moco-config.csv that's pointed to by a local-config.csv symlink.  $extlookup_precedence already specifies local-config, and this symlink is automatically created by the infra puppet.

I'd also like to add a reference to supplied-config.csv, which will contain settings from infra puppet.  This will start with the list of puppet masters, but can eventually include things like usernames and ssh keys, network masks, etc.

Comment 1

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

Attachment: bug758479.patch

Jake, this is related to some changes in infra puppet that I should probably show you at some point.  Look me up in IRC.

Comment 2

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

I committed this as a bustage fix, since the puppet masters are complaining about supplied-config.csv being present in the extlookup directory:

commit e80528c2e5137a0ea3585c7c4a9bc5dca4e06be8
Author: Dustin J. Mitchell <[e-mail]>
Date:   Thu May 24 21:14:26 2012 -0500

    Bug 758479: hgignore supplied-config.csv; a=bustage

diff --git a/.hgignore b/.hgignore
index b635aa6..a60c58d 100644
--- a/.hgignore
+++ b/.hgignore
@@ -3,5 +3,6 @@ syntax: regexp
 ^manifests/extlookup/secrets.csv
 # ignore the local config file/symlink if present
 ^manifests/extlookup/local-config.csv
+^manifests/extlookup/supplied-config.csv
 setup/base-image-centos6.sh
 setup/centos6-kickstart.cfg

Comment 3

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

committed.