Make resource_group mandatory again (but only on CEs) (SOFTWARE-4107)

Author: matyasselmeci

config/40-siteinfo.ini

@@ -19,3 +19,10 @@ host_name = UNAVAILABLE
 ; 
 ; YOU WILL NEED TO CHANGE THIS
 resource = UNAVAILABLE
+
+; Set "resource_group" to the name of the resource that you have registered
+; in the OSG topology repository at https://github.com/opensciencegrid/topology
+; 
+; CEs WILL NEED TO CHANGE THIS
+resource_group = UNAVAILABLE
+

osg_configure/configure_modules/infoservices.py

@@ -235,7 +235,7 @@ def _write_ce_collector_attributes_file(self, attributes_file):
 
         for name, value in [
             ('OSG_Resource', self.osg_resource),
-            ('OSG_ResourceGroup', self.osg_resource_group or ""),
+            ('OSG_ResourceGroup', self.osg_resource_group),
             ('OSG_BatchSystems', ",".join(self.enabled_batch_systems))
         ]:
             attributes_file_lines.append("%s = %s" % (name, utilities.classad_quote(value)))

osg_configure/configure_modules/siteinformation.py

@@ -38,8 +38,7 @@ def __init__(self, *args, **kwargs):
                                               mapping='OSG_SITE_NAME'),
                         'resource_group':
                             configfile.Option(name='resource_group',
-                                              default_value='',
-                                              required=OPTIONAL)}
+                                              required=MANDATORY_ON_CE)}
 
         self.config_section = "Site Information"
         self.enabled = True