diff --git a/src/html/ReqMgr/templates/assign.tmpl b/src/html/ReqMgr/templates/assign.tmpl index 6f8b80379e..39a17b06a8 100644 --- a/src/html/ReqMgr/templates/assign.tmpl +++ b/src/html/ReqMgr/templates/assign.tmpl @@ -115,9 +115,7 @@
  • Custodial sites
    #for site in $sites - #if $site in $non_cust_sites - - #else + #if $site.startswith("T2") #end if #end for @@ -137,11 +133,7 @@
  • Auto-Approve subscription sites
  • diff --git a/src/python/WMCore/ReqMgr/Tools/cms.py b/src/python/WMCore/ReqMgr/Tools/cms.py index 9b4e59f09d..395d5208fb 100644 --- a/src/python/WMCore/ReqMgr/Tools/cms.py +++ b/src/python/WMCore/ReqMgr/Tools/cms.py @@ -32,19 +32,6 @@ def site_black_list(): t3_sites = [s for s in sites() if s.startswith('T3_')] return t3_sites -def cust_sites(): - "Default custodial sites" - return ['T1_US_FNAL', 'T1_CH_CERN'] - -def non_cust_sites(): - "Default non-custodial sites, all T2" - t2_sites = [s for s in sites() if s.startswith('T2_')] - return t2_sites - -def auto_approve_sites(): - "Default custodial sites" - return ['T1_US_FNAL', 'T1_CH_CERN'] - def lfn_bases(): "Return LFN Base list" storeResultLFNBase = [ diff --git a/src/python/WMCore/ReqMgr/Web/ReqMgrService.py b/src/python/WMCore/ReqMgr/Web/ReqMgrService.py index b0ff0a242b..3ae24d27e3 100644 --- a/src/python/WMCore/ReqMgr/Web/ReqMgrService.py +++ b/src/python/WMCore/ReqMgr/Web/ReqMgrService.py @@ -34,7 +34,6 @@ from WMCore.ReqMgr.Tools.cms import web_ui_names, next_status, sites from WMCore.ReqMgr.Tools.cms import lfn_bases, lfn_unmerged_bases from WMCore.ReqMgr.Tools.cms import site_white_list, site_black_list -from WMCore.ReqMgr.Tools.cms import cust_sites, non_cust_sites, auto_approve_sites # WMCore modules from WMCore.WMSpec.WMWorkloadTools import loadSpecByType @@ -418,8 +417,6 @@ def assign(self, **kwds): content = self.templatepage('assign', sort=sortby, site_white_list=site_white_list(), site_black_list=site_black_list(), - cust_sites=cust_sites(), non_cust_sites=non_cust_sites(), - auto_approve_sites=auto_approve_sites(), user=self.user(), user_dn=self.user_dn(), requests=docs, cmssw_versions=releases(), scram_arch=architectures(), sites=sites(), lfn_bases=lfn_bases(),