diff --git a/montecarlo/osg-sites.xml b/montecarlo/osg-sites.xml index 59aeab0..da4475e 100644 --- a/montecarlo/osg-sites.xml +++ b/montecarlo/osg-sites.xml @@ -5,11 +5,11 @@ version="4.0"> - - + + - - + + @@ -22,7 +22,6 @@ True (HAS_CVMFS_xenon_opensciencegrid_org) && - ( GLIDEIN_Site =!= "Comet" ) && (((TARGET.GLIDEIN_ResourceName =!= MY.MachineAttrGLIDEIN_ResourceName1) || (RCC_Factory == "ciconnect") || (GLIDEIN_Site == "MWT2-COREOS")) && ((TARGET.GLIDEIN_ResourceName =!= MY.MachineAttrGLIDEIN_ResourceName2) || @@ -31,8 +30,8 @@ (RCC_Factory == "ciconnect") || (GLIDEIN_Site == "MWT2-COREOS")) && ((TARGET.GLIDEIN_ResourceName =!= MY.MachineAttrGLIDEIN_ResourceName4) || (RCC_Factory == "ciconnect")|| (GLIDEIN_Site == "MWT2-COREOS"))) && - (OSGVO_OS_STRING == "RHEL 6" || OSGVO_OS_STRING == "RHEL 7" || - RCC_Factory == "ciconnect" || (GLIDEIN_ResourceName == "MWT2-COREOS")) + (OSGVO_OS_STRING == "RHEL 7") +