Merge branch 'pr/v4/unused' into wip/v3.99

* pr/v4/unused: Revert "Drop the OSG_HOSTNAME environment variable but keep SiteInformation.host_name since we need it in other places (e.g. gratia) (SOFTWARE-3471)"
opensciencegrid · Feb 24, 2021 · b5451a6 · b5451a6
2 parents 2620def + d0d19c4
commit b5451a6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/osg_configure/configure_modules/siteinformation.py b/osg_configure/configure_modules/siteinformation.py
@@ -31,7 +31,8 @@ def __init__(self, *args, **kwargs):
                                               mapping='OSG_GROUP'),
                         'host_name':
                             configfile.Option(name='host_name',
-                                              required=MANDATORY_ON_CE),
+                                              required=MANDATORY_ON_CE,
+                                              mapping='OSG_HOSTNAME'),
                         'resource':
                             configfile.Option(name='resource',
                                               required=MANDATORY,

diff --git a/scripts/osg-configure b/scripts/osg-configure
@@ -25,6 +25,7 @@ CONFIG_DIRECTORY = '/etc/osg'
 OUTPUT_DIRECTORY = '/var/lib/osg'
 LOG_FILE = '/var/log/osg/osg-configure.log'
 DEFAULT_JOB_ENVIRONMENT_ATTRIBUTES = ['OSG_SITE_NAME',
+                                      'OSG_HOSTNAME',
                                       'OSG_GRID',
                                       'OSG_APP',
                                       'OSG_DATA',

diff --git a/tests/test_siteattributes.py b/tests/test_siteattributes.py
@@ -51,6 +51,7 @@ def testParsing1(self):
 
         attributes = settings.get_attributes()
         variables = {'OSG_GROUP': 'OSG-ITB',
+                     'OSG_HOSTNAME': 'example.com',
                      'OSG_SITE_NAME': 'MY_SITE',
                     }
         for var in variables:
@@ -78,6 +79,7 @@ def testParsing2(self):
 
         attributes = settings.get_attributes()
         variables = {'OSG_GROUP': 'OSG',
+                     'OSG_HOSTNAME': 'example.com',
                      'OSG_SITE_NAME': 'MY_SITE',
                     }
         for var in variables:
@@ -105,6 +107,7 @@ def testParsing3(self):
 
         attributes = settings.get_attributes()
         variables = {'OSG_GROUP': 'OSG',
+                     'OSG_HOSTNAME': 'example.com',
                      'OSG_SITE_NAME': 'MY_SITE',
                     }
         for var in variables: