added QA vofeed; removed htcondor init

docker/etf-cms/config/grid-env.sh

@@ -6,4 +6,5 @@ export MYPROXY_SERVER="myproxy.cern.ch"
 export LCG_LOCATION="/usr"
 export GRID_ENV_LOCATION="/usr/libexec"
 export LCG_GFAL_INFOSYS="top-bdii.cern.ch:2170"
+export ETF_NAGIOS_HOST=ETF_NAGIOS_HOSTXX
 

docker/etf-cms/config/grid-env_ipv6.sh

@@ -8,3 +8,4 @@ export GRID_ENV_LOCATION="/usr/libexec"
 export LCG_GFAL_INFOSYS="top-bdii.cern.ch:2170"
 export GLOBUS_FTP_CLIENT_IPV6="true"
 export GLOBUS_IO_IPV6="true"
+export ETF_NAGIOS_HOST=ETF_NAGIOS_HOSTXX

docker/etf-cms/config/ncgx.cfg

+import os
+
 MB_BROKER_HOST="stomp://oldsam.msg.cern.ch:6163/"
 MB_DESTINATION="/queue/grid.probe.metricOutput.EGEE.etf-cms-prod_cern_ch"
 
-PLUGINS = { "etf_plugin_cms" : { "url": "http://cmssst.web.cern.ch/cmssst/vofeed/vofeed.xml"}}
+if 'preprod' in os.environ.get('ETF_NAGIOS_HOST', None):
+    PLUGINS = { "etf_plugin_cms" : { "url": "http://cmssst.web.cern.ch/cmssst/vofeed/dev/vofeed.xml"}}
+else:
+    PLUGINS = { "etf_plugin_cms" : { "url": "http://cmssst.web.cern.ch/cmssst/vofeed/vofeed.xml"}}
+
 VO = 'cms'
 #ATTRIBUTE_OVERRIDE = [ ('ALL', {'interval' : 15}), ('ALL', { 'passive': False }), ('ALL', {'retry_interval' : 15}) ]
 #COMMAND_OVERRIDE = { 'ALL' : 'ncgx_check!check_random!-s \"o,w,c,u\"' }

docker/etf-cms/docker-entrypoint.sh

@@ -83,16 +83,6 @@ fi
 touch /var/www/html/status_snapshot.json && chown etf.etf /var/www/html/status_snapshot.json
 mkdir -p /var/www/html/etf-raw && chown etf.etf /var/www/html/etf-raw
 
-echo "Configuring HT-Condor ..."
-if [[ -f /usr/bin/condor_status ]]; then
-    /usr/bin/condor_status -schedd -af MyAddress -pool $(hostname) > /var/lib/condor/spool/.schedd_address
-fi
-if [[ ! -s /var/lib/condor/spool/.schedd_address ]]; then
-    echo "Schedd address file empty, waiting 5 seconds before restarting ..."
-    sleep 5
-    exit 1
-fi
-
 cp /etc/ncgx/templates/generic/handlers.cfg /opt/omd/sites/etf/etc/nagios/conf.d/
 
 omd start
@@ -114,6 +104,7 @@ fi
 grep -qF "${ETF_NAGIOS_HOST}" /etc/ncgx/ncgx.cfg || echo "NAGIOS_HOST = \"${ETF_NAGIOS_HOST}\"" >> /etc/ncgx/ncgx.cfg
 sed -i "s/ETF_NAGIOS_HOST/${ETF_NAGIOS_HOST}/" /etc/httpd/conf.d/welcome.conf
 sed -i "s/ETF_NAGIOS_HOST/${ETF_NAGIOS_HOST}/" /var/www/html/index.html
+sed -i "s/ETF_NAGIOS_HOSTXX/${ETF_NAGIOS_HOST}/" /etc/profile.d/grid-env.sh
 
 su etf -c "ncgx --log | tee /opt/omd/sites/etf/var/log/ncgx.log"
 su - etf -c "cmk -II; cmk -O"