Commit f2e00acb authored by Aaron Karper's avatar Aaron Karper Committed by Michele Tartara

Use psqueue library

This change will be used to implement the scheduling of the data
collectors.
Signed-off-by: default avatarAaron Karper <akarper@google.com>
Signed-off-by: default avatarMichele Tartara <mtartara@google.com>
Reviewed-by: default avatarMichele Tartara <mtartara@google.com>
parent 872f1233
......@@ -228,21 +228,23 @@ Optionally, more functionality can be enabled if your build machine has
a few more Haskell libraries enabled: the ``ganeti-confd`` daemon
(``--enable-confd``), the monitoring daemon (``--enable-monitoring``) and
the meta-data daemon (``--enable-metadata``).
The extra dependency for these is:
The extra dependencies for these are:
- `snap-server` <http://hackage.haskell.org/package/snap-server>`_, version
0.8.1 and above.
- `PSQueue <http://hackage.haskell.org/package/PSQueue>`_,
version 1.0 and above.
This library is available in Debian Wheezy or later, so you can use
These libraries are available in Debian Wheezy or later, so you can use
either apt::
$ apt-get install libghc-snap-server-dev
$ apt-get install libghc-snap-server-dev libghc-psqueue-dev
or ``cabal``::
$ cabal install snap-server
$ cabal install snap-server PSQueue
to install it.
to install them.
.. _cabal-note:
.. note::
......
......@@ -696,6 +696,8 @@ AM_CONDITIONAL([ENABLE_CONFD], [test x$has_confd = xTrue])
MONITORING_PKG=
AC_GHC_PKG_CHECK([snap-server], [],
[NS_NODEV=1; MONITORING_PKG="$MONITORING_PKG snap-server"])
AC_GHC_PKG_CHECK([PSQueue], [],
[NS_NODEV=1; MONITORING_PKG="$MONITORING_PKG PSQueue"])
has_monitoring=False
if test "$enable_monitoring" != no; then
......
......@@ -293,6 +293,7 @@ case $DIST_RELEASE in
test-framework-quickcheck2-0.3.0.2 \
\
snap-server-0.9.4.0 \
PSQueue-1.1 \
\
cabal-file-th-0.2.3 \
shelltestrunner
......@@ -318,7 +319,7 @@ case $DIST_RELEASE in
libghc-regex-pcre-dev libghc-attoparsec-dev \
libghc-vector-dev libghc-temporary-dev \
libghc-snap-server-dev libpcre3 libpcre3-dev hscolour hlint pandoc \
libghc-zlib-dev \
libghc-zlib-dev libghc-psqueue-dev \
cabal-install \
python-setuptools python-sphinx python-epydoc graphviz python-pyparsing \
python-simplejson python-pycurl python-paramiko \
......@@ -360,7 +361,7 @@ case $DIST_RELEASE in
libghc-regex-pcre-dev libghc-attoparsec-dev \
libghc-vector-dev libghc-temporary-dev \
libghc-snap-server-dev libpcre3 libpcre3-dev hscolour hlint pandoc \
libghc-zlib-dev \
libghc-zlib-dev libghc-psqueue-dev \
libghc-base64-bytestring-dev libghc-lens-dev libghc-lifted-base-dev \
cabal-install \
python-setuptools python-sphinx python-epydoc graphviz python-pyparsing \
......@@ -388,7 +389,7 @@ EOF
libghc-parallel-dev libghc-utf8-string-dev \
libghc-hslogger-dev libghc-crypto-dev \
libghc-regex-pcre-dev libghc-attoparsec-dev \
libghc-vector-dev libghc-temporary-dev \
libghc-vector-dev libghc-temporary-dev libghc-psqueue-dev \
libghc-snap-server-dev libpcre3 libpcre3-dev hscolour hlint pandoc \
python-setuptools python-sphinx python-epydoc graphviz python-pyparsing \
python-simplejson python-pyinotify python-pycurl python-paramiko \
......@@ -422,7 +423,7 @@ EOF
libghc-parallel-dev libghc-utf8-string-dev \
libghc-hslogger-dev libghc-crypto-dev \
libghc-regex-pcre-dev libghc-attoparsec-dev \
libghc-vector-dev libghc-temporary-dev \
libghc-vector-dev libghc-temporary-dev libghc-psqueue-dev \
libghc-snap-server-dev libpcre3 libpcre3-dev hscolour hlint pandoc \
libghc-lifted-base-dev \
libghc-base64-bytestring-dev \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment