Revert "Drop the OSG_HOSTNAME environment variable but keep SiteInformation.host_name since we need it in other places (e.g. gratia) (SOFTWARE-3471)"

matyasselmeci · matyasselmeci · commit a8fddcf7fd23 · 2021-02-24T11:55:01.000-06:00
as it turns out the gratia config wants the OSG_HOSTNAME attribute too. Not sure why it's using attributes instead of getting the properties directly so I'm not touching it. This reverts commit 27b026f
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:

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ def testParsing1(self):`
`51`	`51`
`52`	`52`	`attributes = settings.get_attributes()`
`53`	`53`	`variables = {'OSG_GROUP': 'OSG-ITB',`
	`54`	`+ 'OSG_HOSTNAME': 'example.com',`
`54`	`55`	`'OSG_SITE_NAME': 'MY_SITE',`
`55`	`56`	`}`
`56`	`57`	`for var in variables:`
`@@ -78,6 +79,7 @@ def testParsing2(self):`
`78`	`79`
`79`	`80`	`attributes = settings.get_attributes()`
`80`	`81`	`variables = {'OSG_GROUP': 'OSG',`
	`82`	`+ 'OSG_HOSTNAME': 'example.com',`
`81`	`83`	`'OSG_SITE_NAME': 'MY_SITE',`
`82`	`84`	`}`
`83`	`85`	`for var in variables:`
`@@ -105,6 +107,7 @@ def testParsing3(self):`
`105`	`107`
`106`	`108`	`attributes = settings.get_attributes()`
`107`	`109`	`variables = {'OSG_GROUP': 'OSG',`
	`110`	`+ 'OSG_HOSTNAME': 'example.com',`
`108`	`111`	`'OSG_SITE_NAME': 'MY_SITE',`
`109`	`112`	`}`
`110`	`113`	`for var in variables:`