# Configure script for Ganeti
m4_define([gnt_version_major], [2])
-m4_define([gnt_version_minor], [4])
-m4_define([gnt_version_revision], [0])
+m4_define([gnt_version_minor], [6])
+m4_define([gnt_version_revision], [1])
m4_define([gnt_version_suffix], [])
m4_define([gnt_version_full],
m4_format([%d.%d.%d%s],
[os_search_path="'/srv/ganeti/os'"])
AC_SUBST(OS_SEARCH_PATH, $os_search_path)
+# --with-extstorage-search-path=...
+# same black sed magic for quoting of the strings in the list
+AC_ARG_WITH([extstorage-search-path],
+ [AS_HELP_STRING([--with-extstorage-search-path=LIST],
+ [comma separated list of directories to]
+ [ search for External Storage Providers]
+ [ (default is /srv/ganeti/extstorage)]
+ )],
+ [es_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/'\1'/g"`],
+ [es_search_path="'/srv/ganeti/extstorage'"])
+AC_SUBST(ES_SEARCH_PATH, $es_search_path)
+
# --with-iallocator-search-path=...
# do a bit of black sed magic to for quoting of the strings in the list
AC_ARG_WITH([iallocator-search-path],
# --with-xen-kernel=...
AC_ARG_WITH([xen-kernel],
[AS_HELP_STRING([--with-xen-kernel=PATH],
- [DomU kernel image for Xen hypervisor (default is /boot/vmlinuz-2.6-xenU)]
+ [DomU kernel image for Xen hypervisor (default is /boot/vmlinuz-3-xenU)]
)],
[xen_kernel="$withval"],
- [xen_kernel="/boot/vmlinuz-2.6-xenU"])
+ [xen_kernel="/boot/vmlinuz-3-xenU"])
AC_SUBST(XEN_KERNEL, $xen_kernel)
# --with-xen-initrd=...
AC_ARG_WITH([xen-initrd],
[AS_HELP_STRING([--with-xen-initrd=PATH],
- [DomU initrd image for Xen hypervisor (default is /boot/initrd-2.6-xenU)]
+ [DomU initrd image for Xen hypervisor (default is /boot/initrd-3-xenU)]
)],
[xen_initrd="$withval"],
- [xen_initrd="/boot/initrd-2.6-xenU"])
+ [xen_initrd="/boot/initrd-3-xenU"])
AC_SUBST(XEN_INITRD, $xen_initrd)
+# --with-xen-cmd=...
+AC_ARG_WITH([xen-cmd],
+ [AS_HELP_STRING([--with-xen-cmd=CMD],
+ [Sets the xen cli interface command (default is xm)]
+ )],
+ [xen_cmd="$withval"],
+ [xen_cmd="xm"])
+AC_SUBST(XEN_CMD, $xen_cmd)
+
+if ! test "$XEN_CMD" = xl -o "$XEN_CMD" = xm; then
+ AC_MSG_ERROR([Unsupported xen command specified])
+fi
+
+# --with-kvm-kernel=...
+AC_ARG_WITH([kvm-kernel],
+ [AS_HELP_STRING([--with-kvm-kernel=PATH],
+ [Guest kernel image for KVM hypervisor (default is /boot/vmlinuz-3-kvmU)]
+ )],
+ [kvm_kernel="$withval"],
+ [kvm_kernel="/boot/vmlinuz-3-kvmU"])
+AC_SUBST(KVM_KERNEL, $kvm_kernel)
+
# --with-file-storage-dir=...
AC_ARG_WITH([file-storage-dir],
[AS_HELP_STRING([--with-file-storage-dir=PATH],
enable_file_storage=False
fi
]],
- [[file_storage_dir="/srv/ganeti/file-storage"; enable_file_storage="True"]])
+ [[file_storage_dir="/srv/ganeti/file-storage";
+ enable_file_storage="True"]])
AC_SUBST(FILE_STORAGE_DIR, $file_storage_dir)
AC_SUBST(ENABLE_FILE_STORAGE, $enable_file_storage)
enable_shared_file_storage=False
fi
]],
- [[shared_file_storage_dir="/srv/ganeti/shared-file-storage"; enable_shared_file_storage="True"]])
+ [[shared_file_storage_dir="/srv/ganeti/shared-file-storage";
+ enable_shared_file_storage="True"]])
AC_SUBST(SHARED_FILE_STORAGE_DIR, $shared_file_storage_dir)
AC_SUBST(ENABLE_SHARED_FILE_STORAGE, $enable_shared_file_storage)
# --with-lvm-stripecount=...
AC_ARG_WITH([lvm-stripecount],
[AS_HELP_STRING([--with-lvm-stripecount=NUM],
- [the number of stripes to use for LVM volumes]
+ [the default number of stripes to use for LVM volumes]
[ (default is 1)]
)],
[lvm_stripecount="$withval"],
group_admin="${withval}admin";
group_confd="${withval}confd";
group_masterd="${withval}masterd";
+ group_noded="root";
group_daemons="${withval}daemons";],
[group_rapi="root";
group_admin="root";
group_confd="root";
group_masterd="root";
+ group_noded="root";
group_daemons="root"])
AC_SUBST(RAPI_GROUP, $group_rapi)
AC_SUBST(ADMIN_GROUP, $group_admin)
AC_SUBST(CONFD_GROUP, $group_confd)
AC_SUBST(MASTERD_GROUP, $group_masterd)
+AC_SUBST(NODED_GROUP, $group_noded)
AC_SUBST(DAEMONS_GROUP, $group_daemons)
# Print the config to the user
# --enable-drbd-barriers
AC_ARG_ENABLE([drbd-barriers],
[AS_HELP_STRING([--enable-drbd-barriers],
- [enable the DRBD barrier functionality (>= 8.0.12) (default: enabled)])],
+ [enable by default the DRBD barriers functionality (>= 8.0.12) (default: enabled)])],
[[if test "$enableval" != no; then
- DRBD_BARRIERS=True
+ DRBD_BARRIERS=n
+ DRBD_NO_META_FLUSH=False
else
- DRBD_BARRIERS=False
+ DRBD_BARRIERS=bf
+ DRBD_NO_META_FLUSH=True
fi
]],
- [DRBD_BARRIERS=True])
+ [DRBD_BARRIERS=n
+ DRBD_NO_META_FLUSH=False
+ ])
AC_SUBST(DRBD_BARRIERS, $DRBD_BARRIERS)
+AC_SUBST(DRBD_NO_META_FLUSH, $DRBD_NO_META_FLUSH)
# --enable-syslog[=no/yes/only]
AC_ARG_ENABLE([syslog],
[],
[enable_htools_rapi=no])
+# --enable-htools
+ENABLE_CONFD=
+AC_ARG_ENABLE([confd],
+ [AS_HELP_STRING([--enable-confd],
+ [enable the ganeti-confd daemon (default: python, options haskell/python/no)])],
+ [[case "$enableval" in
+ no)
+ enable_confd=False
+ py_confd=False
+ hs_confd=False
+ ;;
+ yes|python)
+ enable_confd=True
+ py_confd=True
+ hs_confd=False
+ ;;
+ haskell)
+ enable_confd=True
+ py_confd=False
+ hs_confd=True
+ ;;
+ *)
+ echo "Invalid value for enable-confd '$enableval'"
+ exit 1
+ ;;
+ esac
+ ]],
+ [enable_confd=True;py_confd=True;hs_confd=False])
+AC_SUBST(ENABLE_CONFD, $enable_confd)
+AC_SUBST(PY_CONFD, $py_confd)
+AC_SUBST(HS_CONFD, $hs_confd)
+
+AM_CONDITIONAL([WANT_CONFD], [test x$enable_confd = xTrue])
+AM_CONDITIONAL([PY_CONFD], [test x$py_confd = xTrue])
+AM_CONDITIONAL([HS_CONFD], [test x$hs_confd = xTrue])
+
# --with-disk-separator=...
AC_ARG_WITH([disk-separator],
[AS_HELP_STRING([--with-disk-separator=STRING],
- [Disk index separator, useful if the default of ':' is handled specially by the hypervisor]
+ [Disk index separator, useful if the default of ':' is handled]
+ [ specially by the hypervisor]
)],
[disk_separator="$withval"],
[disk_separator=":"])
AC_PROG_INSTALL
AC_PROG_LN_S
+# Check for the ip command
+AC_ARG_VAR(IP_PATH, [ip path])
+AC_PATH_PROG(IP_PATH, [ip], [])
+if test -z "$IP_PATH"
+then
+ AC_MSG_ERROR([ip command not found])
+fi
+
# Check for pandoc
AC_ARG_VAR(PANDOC, [pandoc path])
AC_PATH_PROG(PANDOC, [pandoc], [])
AC_PATH_PROG(SPHINX, [sphinx-build], [])
if test -z "$SPHINX"
then
- AC_MSG_WARN([sphinx-build not found, documentation rebuild will not be possible])
+ AC_MSG_WARN(m4_normalize([sphinx-build not found, documentation rebuild will
+ not be possible]))
fi
# Check for graphviz (dot)
AC_PATH_PROG(DOT, [dot], [])
if test -z "$DOT"
then
- AC_MSG_WARN([dot (from the graphviz suite) not found, documentation rebuild not possible])
+ AC_MSG_WARN(m4_normalize([dot (from the graphviz suite) not found,
+ documentation rebuild not possible]))
fi
# Check for pylint
AC_MSG_WARN([pylint not found, checking code will not be possible])
fi
+# Check for pep8
+AC_ARG_VAR(PEP8, [pep8 path])
+AC_PATH_PROG(PEP8, [pep8], [])
+if test -z "$PEP8"
+then
+ AC_MSG_WARN([pep8 not found, checking code will not be complete])
+fi
+AM_CONDITIONAL([HAS_PEP8], [test "$PEP8"])
+
# Check for socat
AC_ARG_VAR(SOCAT, [socat path])
AC_PATH_PROG(SOCAT, [socat], [])
AC_MSG_ERROR([socat not found])
fi
+# Check for qemu-img
+AC_ARG_VAR(QEMUIMG_PATH, [qemu-img path])
+AC_PATH_PROG(QEMUIMG_PATH, [qemu-img], [])
+if test -z "$QEMUIMG_PATH"
+then
+ AC_MSG_WARN([qemu-img not found, using ovfconverter will not be possible])
+fi
+
if test "$enable_htools" != "no"; then
# Check for ghc
GHC_PKG_CURL=$($GHC_PKG latest curl)
if test -z "$GHC_PKG_CURL"; then
if test "$enable_htools_rapi" = "check"; then
- AC_MSG_WARN([The curl library not found, htools will be compiled
- without RAPI support])
+ AC_MSG_WARN(m4_normalize([The curl library not found, htools will be
+ compiled without RAPI support]))
else
- AC_MSG_FAILURE([The curl library was not found, but it has
- been requested])
+ AC_MSG_FAILURE(m4_normalize([The curl library was not found, but it has
+ been requested]))
fi
else
HTOOLS_NOCURL=
AC_SUBST(GHC_PKG_CURL)
AC_SUBST(HTOOLS_NOCURL)
AC_MSG_CHECKING([parallel])
- GHC_PKG_PARALLEL=$($GHC_PKG --simple-output list 'parallel-2.*')
+ GHC_PKG_PARALLEL=$($GHC_PKG --simple-output list 'parallel-3.*')
+ if test -n "$GHC_PKG_PARALLEL"
+ then
+ HTOOLS_PARALLEL3=-DPARALLEL3
+ else
+ GHC_PKG_PARALLEL=$($GHC_PKG --simple-output list 'parallel-2.*')
+ fi
if test -z "$GHC_PKG_PARALLEL"
then
GHC_PKG_PARALLEL=$($GHC_PKG --simple-output list 'parallel-1.*')
fi
AC_SUBST(GHC_PKG_PARALLEL)
+ AC_SUBST(HTOOLS_PARALLEL3)
AC_MSG_RESULT($GHC_PKG_PARALLEL)
AC_MSG_CHECKING([json])
GHC_PKG_JSON=$($GHC_PKG latest json)
AC_MSG_CHECKING([network])
GHC_PKG_NETWORK=$($GHC_PKG latest network)
AC_MSG_RESULT($GHC_PKG_NETWORK)
+ AC_MSG_CHECKING([QuickCheck 2.x])
+ GHC_PKG_QUICKCHECK=$($GHC_PKG --simple-output list 'QuickCheck-2.*')
+ AC_MSG_RESULT($GHC_PKG_QUICKCHECK)
if test -z "$GHC_PKG_PARALLEL" || test -z "$GHC_PKG_JSON" || \
test -z "$GHC_PKG_NETWORK"; then
if test "$enable_htools" != "check"; then
- AC_MSG_FAILURE([Required Haskell modules not found, htools compilation
- disabled])
-
+ AC_MSG_FAILURE(m4_normalize([Required Haskell modules not found, htools
+ compilation disabled]))
fi
else
# we leave the other modules to be auto-selected
HTOOLS_MODULES="-package $GHC_PKG_PARALLEL"
fi
+ if test -z "$GHC_PKG_QUICKCHECK"; then
+ AC_MSG_WARN(m4_normalize([The QuickCheck 2.x module was not found,
+ you won't be able to run Haskell unittests]))
+ fi
fi
AC_SUBST(HTOOLS_MODULES)
+AC_SUBST(GHC_PKG_QUICKCHECK)
if test "$enable_htools" != "no"; then
if test -z "$GHC" || test -z "$HTOOLS_MODULES"; then
- AC_MSG_WARN([Haskell compiler/required libraries not found, htools
- compilation disabled])
+ AC_MSG_WARN(m4_normalize([Haskell compiler/required libraries not found,
+ htools compilation disabled]))
else
HTOOLS=yes
fi
AC_ARG_VAR(HSCOLOUR, [HsColour path])
AC_PATH_PROG(HSCOLOUR, [HsColour], [])
if test -z "$HSCOLOUR"; then
- AC_MSG_WARN([HsColour not found, htools API documentation will not be
- generated])
+ AC_MSG_WARN(m4_normalize([HsColour not found, htools API documentation will
+ not be generated]))
fi
# Check for haddock
AC_ARG_VAR(HADDOCK, [haddock path])
AC_PATH_PROG(HADDOCK, [haddock], [])
if test -z "$HADDOCK"; then
- AC_MSG_WARN([haddock not found, htools API documentation will not be
- generated])
+ AC_MSG_WARN(m4_normalize([haddock not found, htools API documentation will
+ not be generated]))
fi
if test "$HADDOCK" && test "$HSCOLOUR"; then
HTOOLS_APIDOC=yes
fi
AC_SUBST(HTOOLS_APIDOC)
+# Check for hlint
+HLINT=no
+AC_ARG_VAR(HLINT, [hlint path])
+AC_PATH_PROG(HLINT, [hlint], [])
+if test -z "$HLINT"; then
+ AC_MSG_WARN([hlint not found, checking code will not be possible])
+fi
+
fi # end if enable_htools, define automake conditions
+if test "$HTOOLS" != "yes" && test "$HS_CONFD" = "True"; then
+ AC_MSG_ERROR(m4_normalize([cannot enable Haskell version of ganeti-confd if
+ htools support is not enabled]))
+fi
+
AM_CONDITIONAL([WANT_HTOOLS], [test x$HTOOLS = xyes])
+AM_CONDITIONAL([WANT_HTOOLSTESTS], [test "x$GHC_PKG_QUICKCHECK" != x])
AM_CONDITIONAL([WANT_HTOOLSAPIDOC], [test x$HTOOLS_APIDOC = xyes])
-
+AM_CONDITIONAL([HAS_HLINT], [test "$HLINT"])
+
+# Check for fakeroot
+AC_ARG_VAR(FAKEROOT_PATH, [fakeroot path])
+AC_PATH_PROG(FAKEROOT_PATH, [fakeroot], [])
+if test -z "$FAKEROOT_PATH"; then
+ AC_MSG_WARN(m4_normalize([fakeroot not found, tests that must run as root
+ will not be executed]))
+fi
+AM_CONDITIONAL([HAS_FAKEROOT], [test "x$FAKEROOT_PATH" != x])
SOCAT_USE_ESCAPE=
AC_ARG_ENABLE([socat-escape],
MAN_HAS_WARNINGS=1
else
MAN_HAS_WARNINGS=
- AC_MSG_WARN([man doesn't support --warnings, man pages checks
- will not be possible])
+ AC_MSG_WARN(m4_normalize([man does not support --warnings, man page checks
+ will not be possible]))
fi
AC_SUBST(MAN_HAS_WARNINGS)
AC_PYTHON_MODULE(pyparsing, t)
AC_PYTHON_MODULE(pyinotify, t)
AC_PYTHON_MODULE(pycurl, t)
+AC_PYTHON_MODULE(affinity)
# This is optional but then we've limited functionality
AC_PYTHON_MODULE(paramiko)
if test "$HAVE_PYMOD_PARAMIKO" = "no"; then
- AC_MSG_WARN([You do not have paramiko installed. While this is optional you
- have to setup SSH and noded on the joining nodes yourself.])
+ AC_MSG_WARN(m4_normalize([You do not have Paramiko installed. While this is
+ optional you have to configure SSH and the node
+ daemon on the joining nodes yourself.]))
fi
AC_CONFIG_FILES([ Makefile ])
projects / ganeti-local / blobdiff