Add EL6 service customization

Author: brianhlin

osgtest/tests/test_150_xrootd.py

@@ -48,6 +48,7 @@ def test_01_start_xrootd(self):
             core.config['xrootd.config'] = '/etc/xrootd/config.d/10-osg-test.cfg'
         else:
             core.config['xrootd.config'] = '/etc/xrootd/config.d/99-osg-test.cfg'
+        core.config['xrootd.service-defaults'] = '/etc/sysconfig/xrootd'
         core.config['xrootd.multiuser'] = False
         core.state['xrootd.started-server'] = False
         core.state['xrootd.backups-exist'] = False
@@ -78,6 +79,11 @@ def test_01_start_xrootd(self):
 
         files.write(core.config['xrootd.config'], xrootd_config, owner='xrootd', backup=True)
 
+        if core.el_release() < 7:
+            files.write(core.config['xrootd.service-defaults'],
+                        'XROOTD_DEFAULT_OPTIONS="-l /var/log/xrootd/xrootd.log -c /etc/xrootd/xrootd-standalone.cfg -k fifo"',
+                        owner="xrootd", chown=(user.pw_uid, user.pw_gid))
+
         authfile = '/etc/xrootd/auth_file'
         files.write(authfile, AUTHFILE_TEXT, owner="xrootd", chown=(user.pw_uid, user.pw_gid))
 

osgtest/tests/test_840_xrootd.py

@@ -16,6 +16,8 @@ def test_01_stop_xrootd(self):
             files.restore('/etc/xrootd/auth_file', "xrootd")
             if not core.rpm_is_installed('xrootd-lcmaps'):
                 files.restore('/etc/grid-security/xrd/xrdmapfile', "xrootd")
+            if core.el_release() < 7:
+                files.restore(core.config['xrootd.service-defaults'], "xrootd")
         core.skip_ok_unless_installed('xrootd', by_dependency=True)
         self.skip_ok_if(core.state['xrootd.started-server'], 'did not start server')
         service.check_stop(core.config['xrootd_service'])