From 72a68498f7dd02e3a7183c6822c32b8cfdd772de Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 10 Mar 2011 14:50:53 +0000 Subject: [PATCH] Try to configure BDII according to the documentation at https://tomtools.cern.ch/confluence/display/IS/ResourceBDII . --- org.glite.lb.yaim/Makefile | 23 ++---- .../config/functions/emi/config_info_service_lb | 95 ++++++++++++++++++++++ org.glite.lb.yaim/config/node-info.d/emi/glite-lb | 3 +- 3 files changed, 105 insertions(+), 16 deletions(-) create mode 100644 org.glite.lb.yaim/config/functions/emi/config_info_service_lb diff --git a/org.glite.lb.yaim/Makefile b/org.glite.lb.yaim/Makefile index 23c90e0..5417642 100644 --- a/org.glite.lb.yaim/Makefile +++ b/org.glite.lb.yaim/Makefile @@ -9,17 +9,13 @@ prefix= -include ../project/version.properties yaim_prefix=/opt/glite -node_info=${top_srcdir}/config/node-info.d/glite-lb -node_info_project=${top_srcdir}/config/node-info.d/${project}/glite-lb +ifeq (${project},emi) +yaim_project=/emi +endif -FILES=glite-lb.pre glite-lb config_glite_lb +FILES=glite-lb.pre config_glite_lb LICENSE COPYRIGHT node-version arch service update all ${FILES}: - if test -f "${node_info_project}"; then \ - cp ${node_info_project} . ; \ - else \ - cp ${node_info} . ; \ - fi glite_var="${localstatedir}/glite"; \ if echo "${localstatedir}" | grep 'glite'>/dev/null; then \ glite_var="${localstatedir}"; \ @@ -41,11 +37,10 @@ install: ${FILES} mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/node-info.d mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/defaults mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/etc/versions - for c in gip_lb info_service_lb ; do \ - install -m 0644 $(top_srcdir)/config/functions/config_$$c ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/functions; \ - done - install -m 0644 config_glite_lb ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/functions; \ - install -m 0644 glite-lb ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/node-info.d + install -m 0644 $(top_srcdir)/config/functions/config_gip_lb ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/functions + install -m 0644 $(top_srcdir)/config/functions${yaim_project}/config_info_service_lb ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/functions + install -m 0644 config_glite_lb ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/functions + install -m 0644 ${top_srcdir}/config/node-info.d${yaim_project}/glite-lb ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/node-info.d install -m 0644 glite-lb.pre ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/defaults echo "$(package) $(module.version)-$(module.age)" > ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/etc/versions/$(package) mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/release/glite-LB @@ -59,4 +54,4 @@ check: clean: rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/ ${FILES} -.PHONY: default all check stage clean +.PHONY: default all check install stage clean diff --git a/org.glite.lb.yaim/config/functions/emi/config_info_service_lb b/org.glite.lb.yaim/config/functions/emi/config_info_service_lb new file mode 100644 index 0000000..ac47061 --- /dev/null +++ b/org.glite.lb.yaim/config/functions/emi/config_info_service_lb @@ -0,0 +1,95 @@ +############################################################################## +# Copyright (c) Members of the EGEE Collaboration. 2004. +# See http://www.eu-egee.org/partners/ for details on the copyright +# holders. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +############################################################################## +# +# NAME : config_info_service_lb +# +# DESCRIPTION : This function configures the dynamic service publisher +# for site LB server node. +# +# AUTHORS : Maria.Alandes.Pradillo@cern.ch +# salvet@ics.muni.cz +# +# NOTES : +# +# YAIM MODULE: glite-yaim-lb +# +############################################################################## + +config_info_service_lb_check () { + requires $1 SITE_NAME INSTALL_ROOT +} + +config_info_service_lb_setenv () { + yaimlog DEBUG "This function currently doesn't set any environment variables." +} + +config_info_service_lb () { + +INFO_SERVICE_CONFIG='/etc/glite/info/service' +INFO_SERVICE_SCRIPT='/usr/bin' +INFO_PROVIDER_PATH='/var/run/bdii/gip/provider' + +SERVICE=LBSERVER +SERVICE_LC=lbserver + +SERVICE_HOST=`hostname -f` + +if [ ! -x ${INFO_SERVICE_SCRIPT}/glite-info-service ]; then + yaimlog ERROR "The script file for glite-info-service was not found in ${INFO_SERVICE_SCRIPT}." + exit 1 +fi +if [ ! -x ${INFO_SERVICE_SCRIPT}/glite-info-service-glue2 ]; then + yaimlog ERROR "The script file for glite-info-service-glue2 was not found in ${INFO_SERVICE_SCRIPT}." + exit 1 +fi + +yaimlog DEBUG "Delete a previous version of the *.conf if it exists" +rm -rf ${INFO_SERVICE_CONFIG}/glite-info-service-${SERVICE_LC}.conf + +yaimlog DEBUG "Create the glite-info-glue2-${SERVICE_LC}.conf file out of the template file" +cp ${INFO_SERVICE_CONFIG}/glite-info-service-${SERVICE_LC}.conf.template ${INFO_SERVICE_CONFIG}/glite-info-service-${SERVICE_LC}.conf +if [ $? != 0 ]; then + yaimlog ERROR "Copying service template failed" + exit 1 +fi + +# Note: the configuration file may need to be altered if non standard values have been used. + +yaimlog DEBUG "Delete a previous version of the glite-info-provider-service-${SERVICE_LC}-wrapper if it exists" +rm -rf ${INFO_PROVIDER_PATH}/glite-info-provider-service-${SERVICE_LC}-wrapper + +yaimlog DEBUG "Create the ${INFO_PROVIDER_PATH} in case it doesn't exist" +mkdir -p ${INFO_PROVIDER_PATH} + +yaimlog DEBUG "Create the glite-info-provider-service-${SERVICE_LC}-wrapper file" +cat << EOF > ${INFO_PROVIDER_PATH}/glite-info-provider-service-${SERVICE_LC}-wrapper +#!/bin/sh +export PATH=$PATH:${INFO_SERVICE_SCRIPT} +export ${SERVICE}_HOST=${SERVICE_HOST} +${INFO_SERVICE_SCRIPT}/glite-info-service ${INFO_SERVICE_CONFIG}/glite-info-service-${SERVICE_LC}.conf $SITE_NAME +${INFO_SERVICE_SCRIPT}/glite-info-service-glue2 ${INFO_SERVICE_CONFIG}/glite-info-service-${SERVICE_LC}.conf $SITE_NAME +EOF + +chmod +x ${INFO_PROVIDER_PATH}/glite-info-provider-service-${SERVICE_LC}-wrapper + + +return 0 + +} + + diff --git a/org.glite.lb.yaim/config/node-info.d/emi/glite-lb b/org.glite.lb.yaim/config/node-info.d/emi/glite-lb index bf5d8e6..d4528bb 100644 --- a/org.glite.lb.yaim/config/node-info.d/emi/glite-lb +++ b/org.glite.lb.yaim/config/node-info.d/emi/glite-lb @@ -3,10 +3,9 @@ config_add_pool_env config_crl config_host_certs config_edgusers -config_gip_lb config_info_service_lb config_gip_service_release config_glite_lb config_glite_locallogger -config_bdii_5.1 +config_bdii_5.2 config_glite_initd" -- 1.8.2.3