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 3d698678dc90 · 2021-02-24T11:55:01.000-06:00
diff --git a/osg_configure/configure_modules/siteinformation.py b/osg_configure/configure_modules/siteinformation.py
@@ -31,8 +31,7 @@ def __init__(self, *args, **kwargs):
                                               mapping='OSG_GROUP'),
                         'host_name':
                             configfile.Option(name='host_name',
-                                              required=MANDATORY_ON_CE,
-                                              mapping='OSG_HOSTNAME'),
+                                              required=MANDATORY_ON_CE),
                         'resource':
                             configfile.Option(name='resource',
                                               required=MANDATORY,
diff --git a/scripts/osg-configure b/scripts/osg-configure
@@ -25,7 +25,6 @@ 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,7 +51,6 @@ 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:
@@ -79,7 +78,6 @@ def testParsing2(self):
 
         attributes = settings.get_attributes()
         variables = {'OSG_GROUP': 'OSG',
-                     'OSG_HOSTNAME': 'example.com',
                      'OSG_SITE_NAME': 'MY_SITE',
                     }
         for var in variables:
@@ -107,7 +105,6 @@ 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,7 +51,6 @@ def testParsing1(self):`
`51`	`51`
`52`	`52`	`attributes = settings.get_attributes()`
`53`	`53`	`variables = {'OSG_GROUP': 'OSG-ITB',`
`54`		`- 'OSG_HOSTNAME': 'example.com',`
`55`	`54`	`'OSG_SITE_NAME': 'MY_SITE',`
`56`	`55`	`}`
`57`	`56`	`for var in variables:`
`@@ -79,7 +78,6 @@ def testParsing2(self):`
`79`	`78`
`80`	`79`	`attributes = settings.get_attributes()`
`81`	`80`	`variables = {'OSG_GROUP': 'OSG',`
`82`		`- 'OSG_HOSTNAME': 'example.com',`
`83`	`81`	`'OSG_SITE_NAME': 'MY_SITE',`
`84`	`82`	`}`
`85`	`83`	`for var in variables:`
`@@ -107,7 +105,6 @@ def testParsing3(self):`
`107`	`105`
`108`	`106`	`attributes = settings.get_attributes()`
`109`	`107`	`variables = {'OSG_GROUP': 'OSG',`
`110`		`- 'OSG_HOSTNAME': 'example.com',`
`111`	`108`	`'OSG_SITE_NAME': 'MY_SITE',`
`112`	`109`	`}`
`113`	`110`	`for var in variables:`