From edc85b0a851628643c9e930be1fa6c0f8c711504 Mon Sep 17 00:00:00 2001
From: Nikos Tsipinakis <nikos.tsipinakis@cern.ch>
Date: Fri, 10 Mar 2023 17:15:27 +0100
Subject: [PATCH] Fix T0 and ITB frontend attributes
---
compiled/fnal/itb/frontend.xml | 38 ++++++++++++++++----------------
compiled/fnal/tier0/frontend.xml | 24 ++++++++++----------
inventory/classes/cern/itb.yml | 1 +
inventory/classes/fnal/itb.yml | 10 +++++++--
inventory/classes/fnal/tier0.yml | 12 ++++++++++
inventory/classes/itb.yml | 1 -
inventory/targets/fnal-tier0.yml | 1 +
templates/frontend.xml | 2 +-
8 files changed, 54 insertions(+), 35 deletions(-)
create mode 100644 inventory/classes/fnal/tier0.yml
diff --git a/compiled/fnal/itb/frontend.xml b/compiled/fnal/itb/frontend.xml
index 712ee2fc..7861302e 100644
--- a/compiled/fnal/itb/frontend.xml
+++ b/compiled/fnal/itb/frontend.xml
@@ -1,4 +1,4 @@
-<frontend advertise_delay="1" advertise_with_multiple="True" advertise_with_tcp="True" downtimes_file="frontenddowntime" frontend_monitor_index_page="True" frontend_name="CMSG-ITB_gWMSFrontend-v1_0" frontend_versioning="False" group_parallel_workers="2" loop_delay="120" restart_attempts="3" restart_interval="1800">
+<frontend advertise_delay="1" advertise_with_multiple="True" advertise_with_tcp="True" downtimes_file="frontenddowntime" frontend_monitor_index_page="True" frontend_name="cmssrv216-fnal-gov_CMS_gWMSFrontend" frontend_versioning="False" group_parallel_workers="2" loop_delay="120" restart_attempts="3" restart_interval="1800">
<config>
<idle_vms_total curb="20000" max="22000"/>
<idle_vms_total_global curb="200000" max="220000"/>
@@ -7,7 +7,7 @@
</config>
<high_availability check_interval="300" enabled="True">
<ha_frontends>
- <ha_frontend frontend_name="cmssrv216-fnal-gov_CMS_gWMSFrontend"/>
+ <ha_frontend frontend_name="CMSG-ITB_gWMSFrontend-v1_0"/>
</ha_frontends>
</high_availability>
<log_retention>
@@ -27,8 +27,8 @@
<match_attr name="GLIDEIN_Retire_Time_Spread" type="int"/>
</match_attrs>
<collectors>
- <collector DN="/DC=ch/DC=cern/OU=computers/CN=vocms0205.cern.ch" factory_identity="gfactory@vocms0205.cern.ch" my_identity="fecmsglobalbackup@vocms0205.cern.ch" node="vocms0205.cern.ch"/>
- <collector DN="/DC=org/DC=incommon/C=US/ST=Wisconsin/L=Madison/O=University of Wisconsin-Madison/OU=OCIS/CN=gfactory-itb-1.opensciencegrid.org" factory_identity="gfactory@gfactory-itb-1.opensciencegrid.org" my_identity="fecmsglobalbackup@gfactory-itb-1.opensciencegrid.org" node="gfactory-itb-1.opensciencegrid.org"/>
+ <collector DN="/DC=ch/DC=cern/OU=computers/CN=vocms0205.cern.ch" factory_identity="gfactory@vocms0205.cern.ch" my_identity="fecmsfnalitb@vocms0205.cern.ch" node="vocms0205.cern.ch"/>
+ <collector DN="/DC=org/DC=incommon/C=US/ST=Wisconsin/L=Madison/O=University of Wisconsin-Madison/OU=OCIS/CN=gfactory-itb-1.opensciencegrid.org" factory_identity="gfactory@gfactory-itb-1.opensciencegrid.org" my_identity="fecmsfnalitb@gfactory-itb-1.opensciencegrid.org" node="gfactory-itb-1.opensciencegrid.org"/>
</collectors>
</factory>
<job query_expr='(JobUniverse=?=5) && ((DESIRED_Sites=!=UNDEFINED) || (DESIRED_Gatekeepers=!=UNDEFINED) || (DESIRED_Entries=!=UNDEFINED)) && (ImageSize=!=UNDEFINED) && (RequestMemory=!=UNDEFINED) && (DESIRED_Sites=!="T0_CH_CERN") && (DESIRED_Sites=!="T2_CH_CERN_HLT") && (DESIRED_Sites=!="T2_CH_CERN_AI") && (DESIRED_Sites=!="T3_CH_CERN_CAF")'>
@@ -69,12 +69,12 @@
</match>
<monitor base_dir="/var/lib/gwms-frontend/web-area/monitor" flot_dir="/usr/share/javascriptrrd/flot" javascriptRRD_dir="/usr/share/javascriptrrd/js" jquery_dir="/usr/share/javascriptrrd/flot"/>
<monitor_footer display_txt="" href_link=""/>
- <security classad_proxy="/etc/gwms-frontend/proxies/fe_proxy" proxy_DN="/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=cmssrvz05.fnal.gov/CN=1628757376" proxy_selection_plugin="ProxyAll" security_name="CMSG-ITB_gWMSFrontend-v1_0" sym_key="aes_256_cbc">
+ <security classad_proxy="/etc/gwms-frontend/proxies/fe_proxy" proxy_DN="/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=cmssrv216.fnal.gov/CN=314083278" proxy_selection_plugin="ProxyAll" security_name="cmssrv216-fnal-gov_CMS_gWMSFrontend" sym_key="aes_256_cbc">
<credentials>
</credentials>
</security>
- <stage base_dir="/var/lib/gwms-frontend/web-area/stage" use_symlink="True" web_base_url="http://vocms0802.cern.ch/vofrontend/stage"/>
- <work base_dir="/var/lib/gwms-frontend/vofrontend" base_log_dir="/var/log/gwms-frontend"/>
+ <stage base_dir="/var/lib/gwms-frontend/web-area/stage" use_symlink="True" web_base_url="http://cmssrv216.fnal.gov:8320/vofrontend/stage"/>
+ <work base_dir="/var/lib/gwms-frontend/vofrontend" base_log_dir="/storage/local/data1/log/gwms-frontend"/>
<attrs>
<attr name="CMS_GLIDEIN_VERSION" glidein_publish="True" job_publish="True" parameter="True" type="int" value="20"/>
<attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="9.0.17"/>
@@ -140,7 +140,7 @@
<security>
<credentials>
<credential absfname="/var/lib/gwms-frontend/tokens.d/cern-itb.local.scitoken" security_class="frontend" trust_domain="grid" type="scitoken"/>
- <credential absfname="/etc/gwms-frontend/proxies/cms_local_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/local_users_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
</credentials>
</security>
<attrs>
@@ -182,7 +182,7 @@
</match>
<security>
<credentials>
- <credential absfname="/etc/gwms-frontend/proxies/cms_pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
</credentials>
</security>
<attrs>
@@ -225,7 +225,7 @@
</match>
<security>
<credentials>
- <credential absfname="/etc/gwms-frontend/proxies/cms_pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
<credential absfname="/var/lib/gwms-frontend/tokens.d/cern-itb.scitoken" security_class="frontend" trust_domain="grid" type="scitoken"/>
</credentials>
</security>
@@ -269,7 +269,7 @@
</match>
<security>
<credentials>
- <credential absfname="/etc/gwms-frontend/proxies/cms_pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
<credential absfname="/var/lib/gwms-frontend/tokens.d/cern-itb.scitoken" security_class="frontend" trust_domain="grid" type="scitoken"/>
</credentials>
</security>
@@ -316,7 +316,7 @@
</match>
<security>
<credentials>
- <credential absfname="/etc/gwms-frontend/proxies/cms_pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
<credential absfname="/var/lib/gwms-frontend/tokens.d/cern-itb.scitoken" security_class="frontend" trust_domain="grid" type="scitoken"/>
</credentials>
</security>
@@ -355,7 +355,7 @@
</match>
<security>
<credentials>
- <credential absfname="/etc/gwms-frontend/proxies/cms_pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
<credential absfname="/var/lib/gwms-frontend/tokens.d/cern-itb.scitoken" security_class="frontend" trust_domain="grid" type="scitoken"/>
</credentials>
</security>
@@ -394,7 +394,7 @@
</match>
<security>
<credentials>
- <credential absfname="/etc/gwms-frontend/proxies/cms_pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
<credential absfname="/var/lib/gwms-frontend/tokens.d/cern.scitoken" security_class="frontend" trust_domain="grid" type="scitoken"/>
</credentials>
</security>
@@ -437,7 +437,7 @@
</match>
<security>
<credentials>
- <credential absfname="/etc/gwms-frontend/proxies/cms_pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
<credential absfname="/var/lib/gwms-frontend/tokens.d/cern-itb.scitoken" security_class="frontend" trust_domain="grid" type="scitoken"/>
</credentials>
</security>
@@ -479,7 +479,7 @@
</match>
<security>
<credentials>
- <credential absfname="/etc/gwms-frontend/proxies/cms_pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
<credential absfname="/var/lib/gwms-frontend/tokens.d/cern-itb.scitoken" security_class="frontend" trust_domain="grid" type="scitoken"/>
</credentials>
</security>
@@ -521,7 +521,7 @@
</match>
<security>
<credentials>
- <credential absfname="/etc/gwms-frontend/proxies/cms_pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
<credential absfname="/var/lib/gwms-frontend/tokens.d/cern-itb.scitoken" security_class="frontend" trust_domain="grid" type="scitoken"/>
</credentials>
</security>
@@ -563,7 +563,7 @@
</match>
<security>
<credentials>
- <credential absfname="/etc/gwms-frontend/proxies/cms_pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
<credential absfname="/var/lib/gwms-frontend/tokens.d/cern-itb.scitoken" security_class="frontend" trust_domain="grid" type="scitoken"/>
</credentials>
</security>
@@ -605,7 +605,7 @@
</match>
<security>
<credentials>
- <credential absfname="/etc/gwms-frontend/proxies/cms_pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
<credential absfname="/var/lib/gwms-frontend/tokens.d/cern-itb.scitoken" security_class="frontend" trust_domain="grid" type="scitoken"/>
</credentials>
</security>
diff --git a/compiled/fnal/tier0/frontend.xml b/compiled/fnal/tier0/frontend.xml
index 6478fdbd..f6d150b1 100644
--- a/compiled/fnal/tier0/frontend.xml
+++ b/compiled/fnal/tier0/frontend.xml
@@ -1,4 +1,4 @@
-<frontend advertise_delay="1" advertise_with_multiple="True" advertise_with_tcp="True" downtimes_file="frontenddowntime" frontend_monitor_index_page="True" frontend_name="cmsgwms-frontend-FNAL" frontend_versioning="False" group_parallel_workers="2" loop_delay="120" restart_attempts="3" restart_interval="1800">
+<frontend advertise_delay="1" advertise_with_multiple="True" advertise_with_tcp="True" downtimes_file="frontenddowntime" frontend_monitor_index_page="True" frontend_name="cmssrv246-fnal-gov_OSG_gWMSFrontend" frontend_versioning="False" group_parallel_workers="2" loop_delay="120" restart_attempts="3" restart_interval="1800">
<config>
<idle_vms_total curb="20000" max="22000"/>
<idle_vms_total_global curb="20000" max="22000"/>
@@ -7,7 +7,7 @@
</config>
<high_availability check_interval="300" enabled="True">
<ha_frontends>
- <ha_frontend frontend_name="CMSG-v1_0"/>
+ <ha_frontend frontend_name="CMS_T0-Frontend"/>
</ha_frontends>
</high_availability>
<log_retention>
@@ -27,9 +27,9 @@
<match_attr name="GLIDEIN_Retire_Time_Spread" type="int"/>
</match_attrs>
<collectors>
- <collector DN="/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/CN=cmssi-factory02.fnal.gov" factory_identity="gfactory@cmssi-factory02.fnal.gov" my_identity="fecmsglobalbackup@cmssi-factory02.fnal.gov" node="cmssi-factory02.fnal.gov"/>
- <collector DN="/DC=ch/DC=cern/OU=computers/CN=vocms0207.cern.ch" factory_identity="gfactory@vocms0207.cern.ch" my_identity="fecmsglobalbackup@vocms0207.cern.ch" node="vocms0207.cern.ch"/>
- <collector DN="/DC=org/DC=incommon/C=US/ST=Wisconsin/L=Madison/O=University of Wisconsin-Madison/OU=OCIS/CN=gfactory-2.opensciencegrid.org" factory_identity="gfactory@gfactory-2.opensciencegrid.org" my_identity="fecmsglobalbackup@gfactory-2.opensciencegrid.org" node="gfactory-2.opensciencegrid.org"/>
+ <collector DN="/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/CN=cmssi-factory02.fnal.gov" factory_identity="gfactory@cmssi-factory02.fnal.gov" my_identity="fecmst0backup@cmssi-factory02.fnal.gov" node="cmssi-factory02.fnal.gov"/>
+ <collector DN="/DC=ch/DC=cern/OU=computers/CN=vocms0207.cern.ch" factory_identity="gfactory@vocms0207.cern.ch" my_identity="fecmst0backup@vocms0207.cern.ch" node="vocms0207.cern.ch"/>
+ <collector DN="/DC=org/DC=incommon/C=US/ST=Wisconsin/L=Madison/O=University of Wisconsin-Madison/OU=OCIS/CN=gfactory-2.opensciencegrid.org" factory_identity="gfactory@gfactory-2.opensciencegrid.org" my_identity="fecmst0backup@gfactory-2.opensciencegrid.org" node="gfactory-2.opensciencegrid.org"/>
</collectors>
</factory>
<job query_expr='(JobUniverse=?=5)&& ((DESIRED_Sites=!=UNDEFINED) || (DESIRED_Gatekeepers=!=UNDEFINED)) && (ImageSize=!=UNDEFINED) && (RequestMemory=!=UNDEFINED) && stringListsIntersect("T0_CH_CERN,T2_CH_CERN_AI,T3_CH_CERN_CAF,T2_CH_CERN",DESIRED_Sites)'>
@@ -92,12 +92,12 @@
</match>
<monitor base_dir="/var/lib/gwms-frontend/web-area/monitor" flot_dir="/usr/share/javascriptrrd/flot" javascriptRRD_dir="/usr/share/javascriptrrd/js" jquery_dir="/usr/share/javascriptrrd/flot"/>
<monitor_footer display_txt="" href_link=""/>
- <security classad_proxy="/etc/gwms-frontend/proxies/fe_proxy" proxy_DN="/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=cmssrvz05.fnal.gov/CN=1628757376" proxy_selection_plugin="ProxyAll" security_name="cmsgwms-frontend-FNAL" sym_key="aes_256_cbc">
+ <security classad_proxy="/etc/gwms-frontend/proxies/fe_proxy" proxy_DN="/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=cmssrv246.fnal.gov/CN=1623500267" proxy_selection_plugin="ProxyAll" security_name="cmssrv246-fnal-gov_OSG_gWMSFrontend" sym_key="aes_256_cbc">
<credentials>
</credentials>
</security>
- <stage base_dir="/var/lib/gwms-frontend/web-area/stage" use_symlink="True" web_base_url="http://cmssrvz05.fnal.gov:8319/vofrontend/stage"/>
- <work base_dir="/var/lib/gwms-frontend/vofrontend" base_log_dir="/var/log/gwms-frontend"/>
+ <stage base_dir="/var/lib/gwms-frontend/web-area/stage" use_symlink="True" web_base_url="http://cmssrv246.fnal.gov:8319/vofrontend/stage"/>
+ <work base_dir="/var/lib/gwms-frontend/vofrontend" base_log_dir="/storage/local/data1/log/gwms-frontend"/>
<attrs>
<attr name="CMS_GLIDEIN_VERSION" glidein_publish="True" job_publish="True" parameter="True" type="int" value="20"/>
<attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="9.0.7"/>
@@ -165,7 +165,7 @@
<security>
<credentials>
<credential absfname="/var/lib/gwms-frontend/tokens.d/cern.local.scitoken" security_class="frontend" trust_domain="grid" type="scitoken"/>
- <credential absfname="/etc/gwms-frontend/proxies/cms_local_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/local_users_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
</credentials>
</security>
<attrs>
@@ -205,7 +205,7 @@
</match>
<security>
<credentials>
- <credential absfname="/etc/gwms-frontend/proxies/cms_pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
<credential absfname="/var/lib/gwms-frontend/tokens.d/cern.scitoken" security_class="frontend" trust_domain="grid" type="scitoken"/>
</credentials>
</security>
@@ -245,7 +245,7 @@
</match>
<security>
<credentials>
- <credential absfname="/etc/gwms-frontend/proxies/cms_pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
<credential absfname="/var/lib/gwms-frontend/tokens.d/cern.scitoken" security_class="frontend" trust_domain="grid" type="scitoken"/>
</credentials>
</security>
@@ -288,7 +288,7 @@
</match>
<security>
<credentials>
- <credential absfname="/etc/gwms-frontend/proxies/cms_pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
+ <credential absfname="/etc/gwms-frontend/proxies/pilot_proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
<credential absfname="/var/lib/gwms-frontend/tokens.d/cern.scitoken" security_class="frontend" trust_domain="grid" type="scitoken"/>
</credentials>
</security>
diff --git a/inventory/classes/cern/itb.yml b/inventory/classes/cern/itb.yml
index 6641c0c7..6595dcf7 100644
--- a/inventory/classes/cern/itb.yml
+++ b/inventory/classes/cern/itb.yml
@@ -6,5 +6,6 @@ parameters:
ha_frontend_name: "cmssrv216-fnal-gov_CMS_gWMSFrontend"
my_identity: fecmsglobalitb
proxy_DN: /DC=ch/DC=cern/OU=computers/CN=frontend04/vocms080.cern.ch
+ frontend_fqdn: vocms0802.cern.ch
proxy_path_local: /var/lib/gwms-frontend/.globus/x509_cmspilot04_cms_local.proxy
proxy_path: /var/lib/gwms-frontend/.globus/x509_cmspilot04_cms_pilot.proxy
\ No newline at end of file
diff --git a/inventory/classes/fnal/itb.yml b/inventory/classes/fnal/itb.yml
index 88dcd4ee..8e057378 100644
--- a/inventory/classes/fnal/itb.yml
+++ b/inventory/classes/fnal/itb.yml
@@ -2,5 +2,11 @@ parameters:
kapitan:
vars:
target: ${target_name}
- frontend_name: CMSG-ITB_gWMSFrontend-v1_0
- ha_frontend_name: "cmssrv216-fnal-gov_CMS_gWMSFrontend"
\ No newline at end of file
+ frontend_name: cmssrv216-fnal-gov_CMS_gWMSFrontend
+ ha_frontend_name: CMSG-ITB_gWMSFrontend-v1_0
+ my_identity: fecmsfnalitb
+ proxy_DN: /DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=cmssrv216.fnal.gov/CN=314083278
+ frontend_fqdn: cmssrv216.fnal.gov:8319
+ proxy_path_local: /etc/gwms-frontend/proxies/local_users_proxy
+ proxy_path: /etc/gwms-frontend/proxies/pilot_proxy
+ base_log_dir: /storage/local/data1/log/gwms-frontend
\ No newline at end of file
diff --git a/inventory/classes/fnal/tier0.yml b/inventory/classes/fnal/tier0.yml
new file mode 100644
index 00000000..6eb71c09
--- /dev/null
+++ b/inventory/classes/fnal/tier0.yml
@@ -0,0 +1,12 @@
+parameters:
+ kapitan:
+ vars:
+ target: ${target_name}
+ frontend_name: cmssrv246-fnal-gov_OSG_gWMSFrontend
+ ha_frontend_name: CMS_T0-Frontend
+ my_identity: fecmst0backup
+ proxy_DN: /DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=cmssrv246.fnal.gov/CN=1623500267
+ frontend_fqdn: cmssrv246.fnal.gov:8319
+ proxy_path_local: /etc/gwms-frontend/proxies/local_users_proxy
+ proxy_path: /etc/gwms-frontend/proxies/pilot_proxy
+ base_log_dir: /storage/local/data1/log/gwms-frontend
\ No newline at end of file
diff --git a/inventory/classes/itb.yml b/inventory/classes/itb.yml
index bb143a86..e9ace41e 100644
--- a/inventory/classes/itb.yml
+++ b/inventory/classes/itb.yml
@@ -2,7 +2,6 @@ parameters:
kapitan:
vars:
target: ${target_name}
- frontend_fqdn: vocms0802.cern.ch
condor_version: 9.0.17
extra_attrs:
- name: ALL_DEBUG
diff --git a/inventory/targets/fnal-tier0.yml b/inventory/targets/fnal-tier0.yml
index cd1767df..2d531db8 100644
--- a/inventory/targets/fnal-tier0.yml
+++ b/inventory/targets/fnal-tier0.yml
@@ -1,6 +1,7 @@
classes:
- defaults
- fnal.common
+ - fnal.tier0
- tier0
- output
diff --git a/templates/frontend.xml b/templates/frontend.xml
index 843946df..1b8cc132 100644
--- a/templates/frontend.xml
+++ b/templates/frontend.xml
@@ -54,7 +54,7 @@
</credentials>
</security>
<stage base_dir="/var/lib/gwms-frontend/web-area/stage" use_symlink="True" web_base_url="http://{{ i.frontend_fqdn }}/vofrontend/stage"/>
- <work base_dir="/var/lib/gwms-frontend/vofrontend" base_log_dir="/var/log/gwms-frontend"/>
+ <work base_dir="/var/lib/gwms-frontend/vofrontend" base_log_dir="{{ i.base_log_dir | default("/var/log/gwms-frontend") }}"/>
<attrs>
<attr name="CMS_GLIDEIN_VERSION" glidein_publish="True" job_publish="True" parameter="True" type="int" value="20"/>
<attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="{{ i.condor_version }}"/>
--
GitLab