Break config_default into master_site_configs.

masters/master.chromium.chromiumos/master.cfg

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from buildbot.changes import svnpoller
 from buildbot.schedulers.basic import SingleBranchScheduler
 
 # These modules come from scripts/master, which must be in the PYTHONPATH.
 from master import build_utils
 from master import chromium_notifier
 from master import master_config
 from master import master_utils
 from master import slaves_list
 
 from master.factory import chromeos_factory
 from master.factory import chromium_factory
 
 # These modules come from scripts/common, which must be in the PYTHONPATH.
 import config
+import master_site_config
 
 
-ActiveMaster = config.Master.ChromiumChromiumOS
-# This is where we sometimes look up things we share with ChromiumOS.
-# The ActiveMaster inherits from Chromium for the rest.
-AlternateMaster = config.Master.ChromiumOS
+ActiveMaster = master_site_config.ChromiumChromiumOS
 
 # Only the production Buildbot master closes the tree on failures.
 TREE_GATE_KEEPER = ActiveMaster.is_production_host
 
 CODESEARCH_NOTIFIER = True
 STATUS_PUSH = False
 
 # This is the dictionary that the buildmaster pays attention to. We also use
 # a shorter alias to save typing.
 c = BuildmasterConfig = {}
@@ skipping 65 matching lines @@
 ####### STATUS TARGETS
 
 # Adds common status and tools to this master.
 master_utils.AutoSetupMaster(c, ActiveMaster,
     public_html='../master.chromium/public_html',
     templates=['../master.chromium/templates'],
     enable_http_status_push=ActiveMaster.is_production_host)
 
 if TREE_GATE_KEEPER:
   import master_gatekeeper_cfg
-  master_gatekeeper_cfg.Update(config, ActiveMaster, AlternateMaster, c)
+  master_gatekeeper_cfg.Update(config, ActiveMaster, c)
 
 ####### PROJECT IDENTITY
 
 # Buildbot master url:
 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.chromiumos/'