Bug 692861

Summary:	Provide aviary configuration drop for config.d
Product:	Red Hat Enterprise MRG	Reporter:	Matthew Farrellee <matt>
Component:	condor-aviary	Assignee:	Matthew Farrellee <matt>
Status:	CLOSED ERRATA	QA Contact:	Tomas Rusnak <trusnak>
Severity:	medium	Docs Contact:
Priority:	medium
Version:	Development	CC:	trusnak
Target Milestone:	2.0
Target Release:	---
Hardware:	Unspecified
OS:	Unspecified
Whiteboard:
Fixed In Version:	condor-7.6.0-0.5	Doc Type:	Bug Fix
Doc Text:		Story Points:	---
Clone Of:		Environment:
Last Closed:	2011-06-27 15:34:32 UTC	Type:	---
Regression:	---	Mount Type:	---
Documentation:	---	CRM:
Verified Versions:		Category:	---
oVirt Team:	---	RHEL 7.3 requirements from Atomic Host:
Cloudforms Team:	---	Target Upstream Version:

Description Matthew Farrellee 2011-04-01 12:35:24 UTC

Similar to

$ rpm -ql condor-qmf | grep config.d 
/etc/condor/config.d/60condor-qmf.config

but with aviary specific configuration.

Likely to mirror bug 692801.

Comment 1 Matthew Farrellee 2011-04-01 20:52:44 UTC

First pass...

# Base configuration for Aviary
#
# Included is the Schedd plugin, AviaryScheddPlugin-plugin.so, and the aviary_query_server

# TODO: What about plugin and query_server port configuration?

# Root of the Axis2 deployable, expected presence of axis2.xml, services/ and lib/
# Subject to change in the future, possibly to /var/lib/condor/axis2
WSFCPP_HOME=/usr

# Aviary Schedd plugin, provides submission and job control endpoint
SCHEDD.PLUGINS = $(SCHEDD.PLUGINS) $(LIB)/plugins/AviaryScheddPlugin-plugin.so

# Aviary query server, provides endpoint for job and submission queries
QUERY_SERVER = $(SBIN)/aviary_query_server
QUERY_SERVER_ARGS = -f
QUERY_SERVER.QUERY_SERVER_LOG = $(LOG)/QueryServerLog
QUERY_SERVER.QUERY_SERVER_DEBUG = D_ALWAYS
DAEMON_LIST = $(DAEMON_LIST), QUERY_SERVER

# HISTORY_INTERVAL specifies the number of seconds between polls of the HISTORY file, default 120
#HISTORY_INTERVAL = 120

# If there is more than one Schedd on the system or if the Schedd and
# QueryServer reside on different systems, it is necessary to tell the
# QueryServer the name of the Schedd it is working with via
# QUERY_SERVER.SCHEDD_NAME. This allows the QueryServer to provide
# fully-qualified job ids, i.e. cluster.proc:pool:scheduler. Default
# is constructed in the same way the Schedd constructs its name.
#QUERY_SERVER.SCHEDD_NAME =

Comment 2 Matthew Farrellee 2011-04-01 21:11:58 UTC

Addition of HTTP_PORT,

# Base configuration for Aviary
#
# Included is the Schedd plugin, AviaryScheddPlugin-plugin.so, and the aviary_query_server

# Root of the Axis2 deployable, expected presence of axis2.xml, services/ and lib/
# Subject to change in the future, possibly to /var/lib/condor/axis2
WSFCPP_HOME=/usr

# Aviary Schedd plugin, provides submission and job control endpoint
SCHEDD.PLUGINS = $(SCHEDD.PLUGINS) $(LIB)/plugins/AviaryScheddPlugin-plugin.so

# Port the Aviary Schedd plugin listens on, default 9090
#SCHEDD.HTTP_PORT = 9090

# Aviary query server, provides endpoint for job and submission queries
QUERY_SERVER = $(SBIN)/aviary_query_server
QUERY_SERVER_ARGS = -f
QUERY_SERVER.QUERY_SERVER_LOG = $(LOG)/QueryServerLog
QUERY_SERVER.QUERY_SERVER_DEBUG = D_ALWAYS
DAEMON_LIST = $(DAEMON_LIST), QUERY_SERVER

# Port the QueryServer listens on, default 9091
#QUERY_SERVER.HTTP_PORT = 9091

# HISTORY_INTERVAL specifies the number of seconds between polls of the HISTORY file, default 120
#QUERY_SERVER.HISTORY_INTERVAL = 120

# If there is more than one Schedd on the system or if the Schedd and
# QueryServer reside on different systems, it is necessary to tell the
# QueryServer the name of the Schedd it is working with via
# QUERY_SERVER.SCHEDD_NAME. This allows the QueryServer to provide
# fully-qualified job ids, i.e. cluster.proc:pool:scheduler. Default
# is constructed in the same way the Schedd constructs its name.
#QUERY_SERVER.SCHEDD_NAME =

Comment 3 Matthew Farrellee 2011-04-01 21:15:19 UTC

Side note: condor-qmf's config should SCHEDD.PLUGIN = $(SCHEDD.PLUGIN) ...

Comment 4 Matthew Farrellee 2011-04-01 21:48:17 UTC

Config is in .../etc/examples/61aviary.config, available on V7_6-aviary-branch. The condor.spec will need updating.

Comment 5 Tomas Rusnak 2011-05-02 12:11:48 UTC

Retest over condor-7.6.1-0.4 packages:

# rpm -ql condor-aviary | grep config.d 
/etc/condor/config.d/61aviary.config

# cat /etc/condor/config.d/61aviary.config 
# Base configuration for Aviary
#
# Included is the Schedd plugin, AviaryScheddPlugin-plugin.so, and the aviary_query_server

# The general Aviary config file for Axis2
# axis2.xml has parameters that point to lib and services dir
WSFCPP_HOME=/var/lib/condor/aviary/axis2.xml

# Aviary Schedd plugin, provides submission and job control endpoint
SCHEDD.PLUGINS = $(SCHEDD.PLUGINS) $(LIB)/plugins/AviaryScheddPlugin-plugin.so

# Port the Aviary Schedd plugin listens on, default 9090
#SCHEDD.HTTP_PORT = 9090

# Aviary query server, provides endpoint for job and submission queries
QUERY_SERVER = $(SBIN)/aviary_query_server
QUERY_SERVER_ARGS = -f
QUERY_SERVER.QUERY_SERVER_LOG = $(LOG)/QueryServerLog
QUERY_SERVER.QUERY_SERVER_DEBUG = D_ALWAYS
DAEMON_LIST = $(DAEMON_LIST), QUERY_SERVER

# Port the QueryServer listens on, default 9091
#QUERY_SERVER.HTTP_PORT = 9091

# HISTORY_INTERVAL specifies the number of seconds between polls of the HISTORY file, default 120
#QUERY_SERVER.HISTORY_INTERVAL = 120

# If there is more than one Schedd on the system or if the Schedd and
# QueryServer reside on different systems, it is necessary to tell the
# QueryServer the name of the Schedd it is working with via
# QUERY_SERVER.SCHEDD_NAME. This allows the QueryServer to provide
# fully-qualified job ids, i.e. cluster.proc:pool:scheduler. Default
# is constructed in the same way the Schedd constructs its name.
#QUERY_SERVER.SCHEDD_NAME =

Config file included in all packages on all supported platforms x86,x86_64/RHEL5,RHEL6.

>>> VERIFIED