Integration of EMIR setup in L&B with yaim.

diff --git a/org.glite.lb.doc/src/LBAG-Installation.tex b/org.glite.lb.doc/src/LBAG-Installation.tex
index ccd317c..1df28a6 100644 (file)
--- a/org.glite.lb.doc/src/LBAG-Installation.tex
+++ b/org.glite.lb.doc/src/LBAG-Installation.tex
@@ -242,6 +242,7 @@ According to local retention policy you may want to use different purge timeouts
 \item \texttt{GLITE\_LB\_MSG\_BROKER} -- URL of the MSG broker, 'auto' for looking in BDII, 'false' for disabling MSG notifications (default: auto)
 \item \texttt{GLITE\_LB\_MSG\_NETWORK} -- required network type when searching in BDII (default: PROD)
 \item \texttt{LCG\_GFAL\_INFOSYS} -- BDII servers (default: lcg-bdii.cern.ch:2170)
+\item \texttt{EMIR\_URL} -- enable publishing \LB service info to EMIR server (default: empty), ignored when using local BDII to publish into EMIR (\texttt{\$BDII\_EMIR\_ENABLE}=\texttt{yes})
 \end{itemize}
 
 Authorization:

diff --git a/org.glite.lb.server/config/setup b/org.glite.lb.server/config/setup
index 669c4f1..34b2c1d 100755 (executable)
--- a/org.glite.lb.server/config/setup
+++ b/org.glite.lb.server/config/setup
@@ -480,7 +480,11 @@ fi
 # ==== emir (info, daemon) ====
 
 if test "$setup_emir_daemon" = "1"; then
-       if test -z "$EMIR_URL"; then
+       if test x"$BDII_EMIR_ENABLE" = x"yes"; then
+               emir=0
+               qecho "skipping native publishing to EMIR (BDII_EMIR_ENABLE is $BDII_EMIR_ENABLE)"
+       fi
+       if test "$emir" != "0" -z "$EMIR_URL"; then
                echo "glite-lb-setup: WARNING: EMIR_URL not set, EMIR won't be configured"
                emir=0
        fi

diff --git a/org.glite.lb.server/doc/glite-lb-setup.8 b/org.glite.lb.server/doc/glite-lb-setup.8
index b537b81..ea308a0 100644 (file)
--- a/org.glite.lb.server/doc/glite-lb-setup.8
+++ b/org.glite.lb.server/doc/glite-lb-setup.8
@@ -86,13 +86,13 @@ Packages \fIbdii\fR, \fIsudo\fR, and \fIglite-info-provider-service\fR must be i
 \fBemir_info\fR
 Creates service info file for L&B.
 
-Package \fIemir-serp\fR must be intalled for this action to take effect.
+Package \fIemir-serp\fR must be installed for this action to take effect.
 
 .TP
 \fBemir_daemon\fR
 Sets up emir-serp daemon.
 
-Package \fIemir-serp\fR must be intalled for this action to take effect.
+Package \fIemir-serp\fR must be installed and $EMIR_URL must be specified for this action to take effect.
 
 .TP
 \fBupgrade_logger\fR (part of upgrade action)