Break config_default into master_site_configs.

masters/master.chromium.chromiumos/master_gatekeeper_cfg.py

 # 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 master import gatekeeper
 from master import master_utils
 
 # This is the list of the builder categories and the corresponding critical
 # steps. If one critical step fails, gatekeeper will close the tree
 # automatically.
@@ skipping 73 matching lines @@
     'BuildBoard',
     'UnitTest',
   ]
 }
 
 subject = ('buildbot %(result)s in %(projectName)s on %(builder)s, '
            'revision %(revision)s')
 warning_header = ('Please look at failure in "%(steps)s" on "%(builder)s" '
                   'and help out if you can')
 
-def Update(config, active_master, alternate_master, c):
+def Update(config, active_master, c):
   # chrome likely/possible failures to the chrome sheriffs, closing the
   # chrome tree
   c['status'].append(gatekeeper.GateKeeper(
       fromaddr=active_master.from_address,
       categories_steps=chromium_categories_steps,
       exclusions=exclusions,
       relayhost=config.Master.smtp,
       subject=subject,
       extraRecipients=active_master.tree_closing_notification_recipients,
       lookup=master_utils.FilterDomain(),
       forgiving_steps=forgiving_steps,
       tree_status_url=active_master.tree_status_url,
       sheriffs=['sheriff'],
       public_html='../master.chromium/public_html',
       use_getname=True))
   # chromium os failures close the chromeOS tree
   c['status'].append(gatekeeper.GateKeeper(
       fromaddr=active_master.from_address,
       categories_steps=close_chromiumos_categories_steps,
       exclusions=exclusions,
       relayhost=config.Master.smtp,
       subject='Closer ' + subject,
-      extraRecipients=alternate_master.tree_closing_notification_recipients,
+      extraRecipients=(
+          active_master.alternate_tree_closing_notification_recipients),
       lookup=master_utils.FilterDomain(),
       forgiving_steps=forgiving_steps,
-      tree_status_url=alternate_master.tree_status_url,
+      tree_status_url=active_master.alternate_tree_status_url,
       sheriffs=['sheriff_cros_mtv', 'sheriff_cros_nonmtv'],
       public_html='../master.chromium/public_html',
       use_getname=True))
   # chromium os buried failures/flakiness to chrome OS folk
   c['status'].append(gatekeeper.GateKeeper(
       fromaddr=active_master.from_address,
       categories_steps=warn_chromiumos_categories_steps,
       exclusions=exclusions,
       relayhost=config.Master.smtp,
       subject='Warning ' + subject,
@@ skipping 14 matching lines @@
       relayhost=config.Master.smtp,
       subject='Warning ' + subject,
       status_header=warning_header,
       extraRecipients=[],
       lookup=master_utils.FilterDomain(),
       forgiving_steps=forgiving_steps,
       tree_status_url=None,
       sheriffs=['sheriff_aura'],
       public_html='../master.chromium/public_html',
       use_getname=True))