X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/b8585908d7189751b679e81ce0b680b1f35f7d75..refs/heads/stable-2.8-grnet-rebased:/Makefile.am diff --git a/Makefile.am b/Makefile.am index eb61fdd..a2e8202 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,9 @@ empty := space := $(empty) $(empty) comma := , +# Helper function to strip src/ and test/hs/ from a list +strip_hsroot = $(patsubst src/%,%,$(patsubst test/hs/%,%,$(1))) + # Use bash in order to be able to use pipefail SHELL=/bin/bash @@ -37,6 +40,7 @@ SHELL_ENV_INIT = autotools/shell-env-init # Note: these are automake-specific variables, and must be named after # the directory + 'dir' suffix clientdir = $(pkgpythondir)/client +cmdlibdir = $(pkgpythondir)/cmdlib hypervisordir = $(pkgpythondir)/hypervisor httpdir = $(pkgpythondir)/http masterddir = $(pkgpythondir)/masterd @@ -61,12 +65,14 @@ HS_DIRS = \ src/Ganeti/Block \ src/Ganeti/Block/Drbd \ src/Ganeti/Confd \ + src/Ganeti/Curl \ src/Ganeti/DataCollectors \ src/Ganeti/HTools \ src/Ganeti/HTools/Backend \ src/Ganeti/HTools/Program \ src/Ganeti/Hypervisor \ src/Ganeti/Hypervisor/Xen \ + src/Ganeti/Monitoring \ src/Ganeti/Query \ test/hs \ test/hs/Test \ @@ -80,22 +86,29 @@ HS_DIRS = \ test/hs/Test/Ganeti/Hypervisor/Xen \ test/hs/Test/Ganeti/Query +# Haskell directories without the roots (src, test/hs) +HS_DIRS_NOROOT = $(filter-out src,$(filter-out test/hs,$(HS_DIRS))) + DIRS = \ $(HS_DIRS) \ autotools \ daemons \ devel \ + devel/data \ doc \ doc/css \ doc/examples \ doc/examples/gnt-debug \ doc/examples/hooks \ + doc/users \ test/data/htools \ test/data/htools/rapi \ test/hs/shelltests \ + test/autotools \ lib \ lib/build \ lib/client \ + lib/cmdlib \ lib/confd \ lib/http \ lib/hypervisor \ @@ -108,6 +121,7 @@ DIRS = \ lib/watcher \ man \ qa \ + qa/patch \ test \ test/data \ test/data/bdev-rbd \ @@ -118,17 +132,7 @@ DIRS = \ ALL_APIDOC_HS_DIRS = \ $(APIDOC_HS_DIR) \ - $(APIDOC_HS_DIR)/Ganeti \ - $(APIDOC_HS_DIR)/Ganeti/Block \ - $(APIDOC_HS_DIR)/Ganeti/Block/Drbd \ - $(APIDOC_HS_DIR)/Ganeti/Confd \ - $(APIDOC_HS_DIR)/Ganeti/DataCollectors \ - $(APIDOC_HS_DIR)/Ganeti/HTools \ - $(APIDOC_HS_DIR)/Ganeti/HTools/Backend \ - $(APIDOC_HS_DIR)/Ganeti/HTools/Program \ - $(APIDOC_HS_DIR)/Ganeti/Hypervisor \ - $(APIDOC_HS_DIR)/Ganeti/Hypervisor/Xen \ - $(APIDOC_HS_DIR)/Ganeti/Query + $(patsubst %,$(APIDOC_HS_DIR)/%,$(call strip_hsroot,$(HS_DIRS_NOROOT))) BUILDTIME_DIR_AUTOCREATE = \ scripts \ @@ -180,15 +184,22 @@ CLEANFILES = \ $(SHELL_ENV_INIT) \ daemons/daemon-util \ daemons/ganeti-cleaner \ + devel/squeeze-amd64.tar.gz \ + devel/squeeze-amd64.conf \ $(mandocrst) \ doc/manpages-enabled.rst \ $(BUILT_EXAMPLES) \ doc/examples/bash_completion \ doc/examples/bash_completion-debug \ + $(userspecs) \ lib/_generated_rpc.py \ $(man_MANS) \ $(manhtml) \ tools/kvm-ifup \ + tools/kvm-ifdown \ + tools/vif-ganeti \ + tools/net-common \ + tools/users-setup \ tools/vcluster-setup \ stamp-directories \ stamp-srclinks \ @@ -196,6 +207,8 @@ CLEANFILES = \ $(HS_ALL_PROGS) $(HS_BUILT_SRCS) \ $(HS_BUILT_TEST_HELPERS) \ src/ganeti-confd \ + src/ganeti-luxid \ + src/ganeti-mond \ .hpc/*.mix src/*.tix test/hs/*.tix \ doc/hs-lint.html @@ -208,7 +221,11 @@ HS_GENERATED_FILES = if WANT_HTOOLS HS_GENERATED_FILES += $(HS_PROGS) if ENABLE_CONFD -HS_GENERATED_FILES += src/hconfd src/ganeti-confd +HS_GENERATED_FILES += src/hconfd src/ganeti-confd src/hluxid src/ganeti-luxid +endif + +if ENABLE_MOND +HS_GENERATED_FILES += src/ganeti-mond endif endif @@ -233,6 +250,7 @@ BUILT_EXAMPLES = \ doc/examples/ganeti-kvm-poweroff.initd \ doc/examples/ganeti.cron \ doc/examples/ganeti.initd \ + doc/examples/ganeti.logrotate \ doc/examples/ganeti-master-role.ocf \ doc/examples/ganeti-node-role.ocf \ doc/examples/gnt-config-backup \ @@ -253,12 +271,12 @@ pkgpython_PYTHON = \ lib/bdev.py \ lib/bootstrap.py \ lib/cli.py \ - lib/cmdlib.py \ lib/compat.py \ lib/config.py \ lib/constants.py \ lib/daemon.py \ lib/errors.py \ + lib/hooksmaster.py \ lib/ht.py \ lib/jqueue.py \ lib/jstore.py \ @@ -298,6 +316,27 @@ client_PYTHON = \ lib/client/gnt_os.py \ lib/client/gnt_storage.py +cmdlib_PYTHON = \ + lib/cmdlib/__init__.py \ + lib/cmdlib/backup.py \ + lib/cmdlib/base.py \ + lib/cmdlib/cluster.py \ + lib/cmdlib/common.py \ + lib/cmdlib/group.py \ + lib/cmdlib/instance.py \ + lib/cmdlib/instance_migration.py \ + lib/cmdlib/instance_operation.py \ + lib/cmdlib/instance_query.py \ + lib/cmdlib/instance_storage.py \ + lib/cmdlib/instance_utils.py \ + lib/cmdlib/misc.py \ + lib/cmdlib/network.py \ + lib/cmdlib/node.py \ + lib/cmdlib/operating_system.py \ + lib/cmdlib/query.py \ + lib/cmdlib/tags.py \ + lib/cmdlib/test.py + hypervisor_PYTHON = \ lib/hypervisor/__init__.py \ lib/hypervisor/hv_base.py \ @@ -382,11 +421,14 @@ docinput = \ doc/design-2.5.rst \ doc/design-2.6.rst \ doc/design-2.7.rst \ + doc/design-2.8.rst \ doc/design-autorepair.rst \ doc/design-bulk-create.rst \ doc/design-chained-jobs.rst \ doc/design-cpu-pinning.rst \ + doc/design-device-uuid-name.rst \ doc/design-draft.rst \ + doc/design-daemons.rst \ doc/design-htools-2.3.rst \ doc/design-http-server.rst \ doc/design-impexp2.rst \ @@ -401,6 +443,7 @@ docinput = \ doc/design-partitioned.rst \ doc/design-query-splitting.rst \ doc/design-query2.rst \ + doc/design-reason-trail.rst \ doc/design-resource-model.rst \ doc/design-restricted-commands.rst \ doc/design-shared-storage.rst \ @@ -408,7 +451,7 @@ docinput = \ doc/design-virtual-clusters.rst \ doc/design-x509-ca.rst \ doc/design-hroller.rst \ - doc/design-storagespace.rst \ + doc/design-storagetypes.rst \ doc/devnotes.rst \ doc/glossary.rst \ doc/hooks.rst \ @@ -418,6 +461,7 @@ docinput = \ doc/install.rst \ doc/locking.rst \ doc/manpages-disabled.rst \ + doc/monitoring-query-format.rst \ doc/move-instance.rst \ doc/news.rst \ doc/ovfconverter.rst \ @@ -434,12 +478,17 @@ mandocrst = $(addprefix doc/man-,$(notdir $(manrst))) HS_BIN_PROGS=src/htools # Haskell programs to be installed in the MYEXECLIB dir +if ENABLE_MOND HS_MYEXECLIB_PROGS=src/mon-collector +else +HS_MYEXECLIB_PROGS= +endif -# Haskell programs to compiled but not installed automatically -# Usually they have their own specific installation rules +# Haskell programs to be compiled by "make really-all" HS_COMPILE_PROGS= \ + src/ganeti-mond \ src/hconfd \ + src/hluxid \ src/rpc-test # All Haskell non-test programs to be compiled but not automatically installed @@ -492,6 +541,8 @@ HS_LIB_SRCS = \ src/Ganeti/Confd/Types.hs \ src/Ganeti/Confd/Utils.hs \ src/Ganeti/Config.hs \ + src/Ganeti/ConfigReader.hs \ + src/Ganeti/Curl/Multi.hs \ src/Ganeti/Daemon.hs \ src/Ganeti/DataCollectors/CLI.hs \ src/Ganeti/DataCollectors/Drbd.hs \ @@ -511,6 +562,7 @@ HS_LIB_SRCS = \ src/Ganeti/HTools/Group.hs \ src/Ganeti/HTools/Instance.hs \ src/Ganeti/HTools/Loader.hs \ + src/Ganeti/HTools/Nic.hs \ src/Ganeti/HTools/Node.hs \ src/Ganeti/HTools/PeerMap.hs \ src/Ganeti/HTools/Program/Hail.hs \ @@ -531,12 +583,14 @@ HS_LIB_SRCS = \ src/Ganeti/Jobs.hs \ src/Ganeti/Logging.hs \ src/Ganeti/Luxi.hs \ + src/Ganeti/Monitoring/Server.hs \ src/Ganeti/Network.hs \ src/Ganeti/Objects.hs \ src/Ganeti/OpCodes.hs \ src/Ganeti/OpParams.hs \ src/Ganeti/Path.hs \ src/Ganeti/Query/Common.hs \ + src/Ganeti/Query/Export.hs \ src/Ganeti/Query/Filter.hs \ src/Ganeti/Query/Group.hs \ src/Ganeti/Query/Job.hs \ @@ -584,6 +638,7 @@ HS_TEST_SRCS = \ test/hs/Test/Ganeti/OpCodes.hs \ test/hs/Test/Ganeti/Query/Filter.hs \ test/hs/Test/Ganeti/Query/Language.hs \ + test/hs/Test/Ganeti/Query/Network.hs \ test/hs/Test/Ganeti/Query/Query.hs \ test/hs/Test/Ganeti/Rpc.hs \ test/hs/Test/Ganeti/Runtime.hs \ @@ -600,8 +655,13 @@ HS_LIBTEST_SRCS = $(HS_LIB_SRCS) $(HS_TEST_SRCS) HS_BUILT_SRCS = \ test/hs/Test/Ganeti/TestImports.hs \ src/Ganeti/Constants.hs \ + src/Ganeti/Curl/Internal.hs \ src/Ganeti/Version.hs -HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS)) +HS_BUILT_SRCS_IN = \ + $(patsubst %,%.in,$(filter-out src/Ganeti/Curl/Internal.hs,$(HS_BUILT_SRCS))) \ + src/Ganeti/Curl/Internal.hsc + +HS_LIBTESTBUILT_SRCS = $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS) $(RUN_IN_TEMPDIR): | stamp-directories @@ -617,7 +677,7 @@ doc/man-html/index.html: doc/manpages-enabled.rst $(mandocrst) doc/html/index.html doc/man-html/index.html: $(docinput) doc/conf.py \ configure.ac $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py \ lib/build/shell_example_lexer.py lib/opcodes.py lib/ht.py \ - doc/css/style.css \ + doc/css/style.css lib/rapi/connector.py lib/rapi/rlib2.py \ | $(BUILT_PYTHON_SOURCES) @test -n "$(SPHINX)" || \ { echo 'sphinx-build' not found during configure; exit 1; } @@ -690,17 +750,29 @@ else exit 1; endif +doc/users/%: doc/users/%.in Makefile $(REPLACE_VARS_SED) + cat $< | sed -f $(REPLACE_VARS_SED) | LC_ALL=C sort | uniq | (grep -v '^root' || true) > $@ + +userspecs = \ + doc/users/users \ + doc/users/groups \ + doc/users/groupmemberships + # Things to build but not to install (add it to EXTRA_DIST if it should be # distributed) noinst_DATA = \ - doc/html \ $(BUILT_EXAMPLES) \ doc/examples/bash_completion \ doc/examples/bash_completion-debug \ + $(userspecs) \ $(manhtml) +if HAS_SPHINX if MANPAGES_IN_DOC noinst_DATA += doc/man-html +else +noinst_DATA += doc/html +endif endif gnt_scripts = \ @@ -741,6 +813,7 @@ qa_scripts = \ qa/qa_group.py \ qa/qa_instance.py \ qa/qa_job.py \ + qa/qa_logging.py \ qa/qa_node.py \ qa/qa_os.py \ qa/qa_rapi.py \ @@ -760,7 +833,7 @@ install-exec-hook: done endif -$(HS_ALL_PROGS): %: %.hs $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS) Makefile +$(HS_ALL_PROGS): %: %.hs $(HS_LIBTESTBUILT_SRCS) Makefile @if [ "$(notdir $@)" = "test" ] && [ "$(HS_NODEV)" ]; then \ echo "Error: cannot run unittests without the development" \ " libraries (see devnotes.rst)" 1>&2; \ @@ -769,7 +842,7 @@ $(HS_ALL_PROGS): %: %.hs $(HS_LIBTEST_SRCS) $(HS_BUILT_SRCS) Makefile @rm -f $(notdir $@).tix $(GHC) --make \ $(HFLAGS) \ - $(HS_NOCURL) $(HS_PARALLEL3) $(HS_REGEX_PCRE) \ + $(HS_PARALLEL3) $(HS_REGEX_PCRE) \ -osuf $(notdir $@).o -hisuf $(notdir $@).hi \ $(HEXTRA) $(HEXTRA_INT) $@ @touch "$@" @@ -784,7 +857,7 @@ test/hs/hpc-htools: HEXTRA_INT=-fhpc test/hs/hpc-mon-collector: HEXTRA_INT=-fhpc # test dependency -test/hs/offline-tests.sh: test/hs/hpc-htools test/hs/hpc-mon-collector +test/hs/offline-test.sh: test/hs/hpc-htools test/hs/hpc-mon-collector # rules for building profiling-enabled versions of the haskell # programs: hs-prof does the full two-step build, whereas @@ -819,7 +892,15 @@ if ENABLE_CONFD src/ganeti-confd: src/hconfd cp -f $< $@ +src/ganeti-luxid: src/hluxid + cp -f $< $@ + nodist_sbin_SCRIPTS += src/ganeti-confd +nodist_sbin_SCRIPTS += src/ganeti-luxid +endif + +if ENABLE_MOND +nodist_sbin_SCRIPTS += src/ganeti-mond endif python_scripts = \ @@ -836,6 +917,7 @@ python_scripts = \ dist_tools_SCRIPTS = \ $(python_scripts) \ + tools/burnin \ tools/kvm-console-wrapper \ tools/master-ip-setup \ tools/xen-console-wrapper @@ -845,6 +927,7 @@ nodist_tools_python_scripts = \ nodist_tools_SCRIPTS = \ $(nodist_tools_python_scripts) \ + tools/users-setup \ tools/vcluster-setup pkglib_python_scripts = \ @@ -852,7 +935,6 @@ pkglib_python_scripts = \ tools/check-cert-expired nodist_pkglib_python_scripts = \ - tools/burnin \ tools/ensure-dirs \ tools/node-daemon-setup \ tools/prepare-node-join @@ -860,6 +942,9 @@ nodist_pkglib_python_scripts = \ myexeclib_SCRIPTS = \ daemons/daemon-util \ tools/kvm-ifup \ + tools/kvm-ifdown \ + tools/vif-ganeti \ + tools/net-common \ $(pkglib_python_scripts) \ $(HS_MYEXECLIB_PROGS) @@ -895,6 +980,9 @@ EXTRA_DIST = \ devel/upload \ devel/webserver \ tools/kvm-ifup.in \ + tools/kvm-ifdown.in \ + tools/vif-ganeti.in \ + tools/net-common.in \ tools/vcluster-setup.in \ $(docinput) \ doc/html \ @@ -905,6 +993,9 @@ EXTRA_DIST = \ doc/examples/gnt-debug/README \ doc/examples/gnt-debug/delay0.json \ doc/examples/gnt-debug/delay50.json \ + doc/users/groupmemberships.in \ + doc/users/groups.in \ + doc/users/users.in \ test/py/lockperf.py \ test/py/testutils.py \ test/py/mocks.py \ @@ -925,8 +1016,10 @@ EXTRA_DIST = \ man_MANS = \ man/ganeti-cleaner.8 \ man/ganeti-confd.8 \ + man/ganeti-luxid.8 \ man/ganeti-listrunner.8 \ man/ganeti-masterd.8 \ + man/ganeti-mond.8 \ man/ganeti-noded.8 \ man/ganeti-os-interface.7 \ man/ganeti-extstorage-interface.7 \ @@ -944,6 +1037,7 @@ man_MANS = \ man/gnt-os.8 \ man/gnt-storage.8 \ man/hail.1 \ + man/harep.1 \ man/hbal.1 \ man/hcheck.1 \ man/hinfo.1 \ @@ -965,28 +1059,40 @@ maninput = \ $(mangen) TEST_FILES = \ + test/autotools/autotools-check-news.test \ test/data/htools/clean-nonzero-score.data \ test/data/htools/common-suffix.data \ test/data/htools/empty-cluster.data \ test/data/htools/hail-alloc-drbd.json \ + test/data/htools/hail-alloc-invalid-network.json \ + test/data/htools/hail-alloc-invalid-twodisks.json \ + test/data/htools/hail-alloc-restricted-network.json \ + test/data/htools/hail-alloc-twodisks.json \ test/data/htools/hail-change-group.json \ test/data/htools/hail-invalid-reloc.json \ test/data/htools/hail-node-evac.json \ test/data/htools/hail-reloc-drbd.json \ test/data/htools/hbal-excl-tags.data \ test/data/htools/hbal-split-insts.data \ + test/data/htools/hspace-tiered-dualspec.data \ + test/data/htools/hspace-tiered-ipolicy.data \ + test/data/htools/hspace-tiered-resourcetypes.data \ + test/data/htools/hspace-tiered.data \ test/data/htools/invalid-node.data \ test/data/htools/missing-resources.data \ + test/data/htools/multiple-master.data \ test/data/htools/n1-failure.data \ test/data/htools/rapi/groups.json \ test/data/htools/rapi/info.json \ test/data/htools/rapi/instances.json \ test/data/htools/rapi/nodes.json \ + test/data/htools/unique-reboot-order.data \ test/hs/shelltests/htools-balancing.test \ test/hs/shelltests/htools-basic.test \ test/hs/shelltests/htools-dynutil.test \ test/hs/shelltests/htools-excl.test \ test/hs/shelltests/htools-hail.test \ + test/hs/shelltests/htools-hroller.test \ test/hs/shelltests/htools-hspace.test \ test/hs/shelltests/htools-invalid.test \ test/hs/shelltests/htools-multi-group.test \ @@ -1014,6 +1120,8 @@ TEST_FILES = \ test/data/bdev-rbd/output_invalid.txt \ test/data/cert1.pem \ test/data/cert2.pem \ + test/data/cluster_config_2.7.json \ + test/data/cluster_config_downgraded_2.7.json \ test/data/instance-minor-pairing.txt \ test/data/ip-addr-show-dummy0.txt \ test/data/ip-addr-show-lo-ipv4.txt \ @@ -1028,6 +1136,9 @@ TEST_FILES = \ test/data/kvm_0.9.1_help_boot_test.txt \ test/data/kvm_1.0_help.txt \ test/data/kvm_1.1.2_help.txt \ + test/data/kvm_runtime.json \ + test/data/NEWS_OK.txt \ + test/data/NEWS_previous_unreleased.txt \ test/data/ovfdata/compr_disk.vmdk.gz \ test/data/ovfdata/config.ini \ test/data/ovfdata/corrupted_resources.ovf \ @@ -1059,6 +1170,8 @@ TEST_FILES = \ test/data/proc_drbd83_sync.txt \ test/data/proc_drbd83_sync_want.txt \ test/data/proc_drbd83_sync_krnl2.6.39.txt \ + test/data/proc_meminfo.txt \ + test/data/proc_cpuinfo.txt \ test/data/qa-minimal-nodes-instances-only.json \ test/data/sys_drbd_usermode_helper.txt \ test/data/vgreduce-removemissing-2.02.02.txt \ @@ -1070,10 +1183,12 @@ TEST_FILES = \ test/data/xen-xm-list-4.0.1-dom0-only.txt \ test/data/xen-xm-list-4.0.1-four-instances.txt \ test/data/xen-xm-list-long-4.0.1.txt \ + test/data/xen-xm-uptime-4.0.1.txt \ test/py/ganeti-cli.test \ test/py/gnt-cli.test \ test/py/import-export_unittest-helper + python_tests = \ doc/examples/rapi_testutils.py \ test/py/cfgupgrade_unittest.py \ @@ -1163,8 +1278,11 @@ dist_TESTS = \ test/py/ganeti-cleaner_unittest.bash \ test/py/import-export_unittest.bash \ test/py/cli-test.bash \ - test/py/bash_completion.bash \ - $(python_tests) + test/py/bash_completion.bash + +if PY_UNIT +dist_TESTS += $(python_tests) +endif nodist_TESTS = check_SCRIPTS = @@ -1197,9 +1315,9 @@ all_python_code = \ $(pkglib_python_scripts) \ $(nodist_pkglib_python_scripts) \ $(nodist_tools_python_scripts) \ - $(python_tests) \ $(pkgpython_PYTHON) \ $(client_PYTHON) \ + $(cmdlib_PYTHON) \ $(hypervisor_PYTHON) \ $(rapi_PYTHON) \ $(server_PYTHON) \ @@ -1213,6 +1331,10 @@ all_python_code = \ $(noinst_PYTHON) \ $(qa_scripts) +if PY_UNIT +all_python_code += $(python_tests) +endif + srclink_files = \ man/footer.rst \ test/py/check-cert-expired_unittest.bash \ @@ -1272,6 +1394,40 @@ tools/kvm-ifup: tools/kvm-ifup.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ chmod +x $@ +tools/kvm-ifdown: tools/kvm-ifdown.in $(REPLACE_VARS_SED) + sed -f $(REPLACE_VARS_SED) < $< > $@ + chmod +x $@ + +tools/vif-ganeti: tools/vif-ganeti.in $(REPLACE_VARS_SED) + sed -f $(REPLACE_VARS_SED) < $< > $@ + chmod +x $@ + +tools/net-common: tools/net-common.in $(REPLACE_VARS_SED) + sed -f $(REPLACE_VARS_SED) < $< > $@ + chmod +x $@ + +tools/users-setup: Makefile $(userspecs) + set -e; \ + { echo '#!/bin/sh'; \ + echo 'if [ "x$$1" != "x--yes-do-it" ];'; \ + echo 'then echo "This will do the following changes"'; \ + $(AWK) -- '{print "echo + Will add group ",$$1; count++}\ + END {if (count == 0) {print "echo + No groups to add"}}' doc/users/groups; \ + $(AWK) -- '{if (NF > 1) {print "echo + Will add user",$$1,"with primary group",$$2} \ + else {print "echo + Will add user",$$1}; count++}\ + END {if (count == 0) {print "echo + No users to add"}}' doc/users/users; \ + $(AWK) -- '{print "echo + Will add user",$$1,"to group",$$2}' doc/users/groupmemberships; \ + echo 'echo'; \ + echo 'echo "OK? (y/n)"'; \ + echo 'read confirm'; \ + echo 'if [ "x$$confirm" != "xy" ]; then exit 0; fi'; \ + echo 'fi'; \ + $(AWK) -- '{print "addgroup --system",$$1}' doc/users/groups; \ + $(AWK) -- '{if (NF > 1) {print "adduser --system --ingroup",$$2,$$1} else {print "adduser --system",$$1}}' doc/users/users; \ + $(AWK) -- '{print "adduser",$$1,$$2}' doc/users/groupmemberships; \ + } > $@ + chmod +x $@ + tools/vcluster-setup: tools/vcluster-setup.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ chmod +x $@ @@ -1311,7 +1467,7 @@ man/%.gen: man/%.rst lib/query.py lib/build/sphinx_ext.py \ man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.rst @test -n "$(PANDOC)" || \ { echo 'pandoc' not found during configure; exit 1; } - set -o pipefail ; \ + set -o pipefail -e; \ trap 'echo auto-removing $@; rm $@' EXIT; \ $(PANDOC) -s -f rst -t man $< man/footer.rst | \ sed -e 's/\\@/@/g' > $@; \ @@ -1371,6 +1527,9 @@ src/Ganeti/Constants.hs: src/Ganeti/Constants.hs.in \ PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CONVERT_CONSTANTS); \ } > $@ +src/Ganeti/Curl/Internal.hs: src/Ganeti/Curl/Internal.hsc | stamp-directories + hsc2hs -o $@ $< + test/hs/Test/Ganeti/TestImports.hs: test/hs/Test/Ganeti/TestImports.hs.in \ $(built_base_sources) set -e; \ @@ -1443,8 +1602,12 @@ lib/_autoconf.py: Makefile | stamp-directories echo "RAPI_GROUP = '$(RAPI_GROUP)'"; \ echo "CONFD_USER = '$(CONFD_USER)'"; \ echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \ + echo "LUXID_USER = '$(LUXID_USER)'"; \ + echo "LUXID_GROUP = '$(LUXID_GROUP)'"; \ echo "NODED_USER = '$(NODED_USER)'"; \ echo "NODED_GROUP = '$(NODED_GROUP)'"; \ + echo "MOND_USER = '$(MOND_USER)'"; \ + echo "MOND_GROUP = '$(MOND_GROUP)'"; \ echo "DISK_SEPARATOR = '$(DISK_SEPARATOR)'"; \ echo "QEMUIMG_PATH = '$(QEMUIMG_PATH)'"; \ echo "HTOOLS = True"; \ @@ -1452,7 +1615,7 @@ lib/_autoconf.py: Makefile | stamp-directories echo "XEN_CMD = '$(XEN_CMD)'"; \ echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \ echo "ENABLE_RESTRICTED_COMMANDS = $(ENABLE_RESTRICTED_COMMANDS)"; \ - echo "ENABLE_MONITORING = $(ENABLE_MONITORING)"; \ + echo "ENABLE_MOND = $(ENABLE_MOND)"; \ ## Write dictionary with man page name as the key and the section number as the ## value echo "MAN_PAGES = {"; \ @@ -1522,13 +1685,19 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \ echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \ echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \ + echo 's#@''GNTLUXIDUSER@#$(LUXID_USER)#g'; \ echo 's#@''GNTNODEDUSER@#$(NODED_USER)#g'; \ + echo 's#@''GNTMONDUSER@#$(MOND_USER)#g'; \ echo 's#@''GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \ echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \ echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \ + echo 's#@''GNTNODEDGROUP@#$(NODED_GROUP)#g'; \ + echo 's#@''GNTLUXIDGROUP@#$(LUXID_GROUP)#g'; \ echo 's#@''GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \ + echo 's#@''GNTMONDGROUP@#$(MOND_GROUP)#g'; \ echo 's#@''GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \ echo 's#@''CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \ + echo 's#@''CUSTOM_ENABLE_MOND@#$(ENABLE_MOND)#g'; \ echo 's#@''MODULES@#$(strip $(lint_python_code))#g'; \ echo 's#@''XEN_CONFIG_DIR@#$(XEN_CONFIG_DIR)#g'; \ echo; \ @@ -1632,30 +1801,32 @@ check-local: check-dirs $(GENERATED_FILES) $(CHECK_PYTHON_CODE) $(check_python_code) PYTHONPATH=. $(CHECK_HEADER) $(check_python_code) $(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS - $(CHECK_NEWS) < $(top_srcdir)/NEWS + RELEASE=$(PACKAGE_VERSION) $(CHECK_NEWS) < $(top_srcdir)/NEWS PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules) - @expver=$(VERSION_MAJOR).$(VERSION_MINOR); \ error= ; \ - if test "`head -n 1 $(top_srcdir)/README`" != "Ganeti $$expver"; then \ - echo "Incorrect version in README, expected $$expver" >&2; \ - error=1; \ - fi; \ - for file in doc/iallocator.rst doc/hooks.rst doc/virtual-cluster.rst \ - doc/security.rst; do \ - if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \ - "Documents Ganeti version $$expver"; then \ - echo "Incorrect version in $$file, expected $$expver" >&2; \ + if [ "x`echo $(VERSION_SUFFIX)|grep 'alpha'`" == "x" ]; then \ + expver=$(VERSION_MAJOR).$(VERSION_MINOR); \ + if test "`head -n 1 $(top_srcdir)/README`" != "Ganeti $$expver"; then \ + echo "Incorrect version in README, expected $$expver" >&2; \ + error=1; \ + fi; \ + for file in doc/iallocator.rst doc/hooks.rst doc/virtual-cluster.rst \ + doc/security.rst; do \ + if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \ + "Documents Ganeti version $$expver"; then \ + echo "Incorrect version in $$file, expected $$expver" >&2; \ + error=1; \ + fi; \ + done; \ + if ! test -f $(top_srcdir)/doc/design-$$expver.rst; then \ + echo "File $(top_srcdir)/doc/design-$$expver.rst not found" >&2; \ + error=1; \ + fi; \ + if test "`sed -ne '5 p' $(top_srcdir)/doc/design-draft.rst`" != \ + ".. Last updated for Ganeti $$expver"; then \ + echo "doc/design-draft.rst was not updated for version $$expver" >&2; \ error=1; \ fi; \ - done; \ - if ! test -f $(top_srcdir)/doc/design-$$expver.rst; then \ - echo "File $(top_srcdir)/doc/design-$$expver.rst not found" >&2; \ - error=1; \ - fi; \ - if test "`sed -ne '5 p' $(top_srcdir)/doc/design-draft.rst`" != \ - ".. Last updated for Ganeti $$expver"; then \ - echo "doc/design-draft.rst was not updated for version $$expver" >&2; \ - error=1; \ fi; \ for file in configure.ac $(HS_LIBTEST_SRCS) $(HS_PROG_SRCS); do \ if test $$(wc --max-line-length < $(top_srcdir)/$$file) -gt 80; then \ @@ -1773,18 +1944,12 @@ distcheck-hook: echo "Found empty files or directories in final archive." 1>&2; \ exit 1; \ fi - if test -n "$(BUILD_RELEASE)" && \ - grep -n -H -E '^\*.*unreleased' $(top_distdir)/NEWS; then \ - echo "Found unreleased version in NEWS." >&2; \ - exit 1; \ - fi if test -e $(top_distdir)/doc/man-html; then \ echo "Found documentation including man pages in final archive" >&2; \ exit 1; \ fi -# When building a release, stricter checks should be used -distcheck-release dist-release: export BUILD_RELEASE = 1 +# Backwards compatible distcheck-release target distcheck-release: distcheck distrebuildcheck: dist @@ -1828,7 +1993,9 @@ py-apidoc: epydoc.conf $(RUN_IN_TEMPDIR) $(GENERATED_FILES) --output $(CURDIR)/$(APIDOC_PY_DIR) .PHONY: hs-apidoc -hs-apidoc: $(HS_BUILT_SRCS) +hs-apidoc: $(APIDOC_HS_DIR)/index.html + +$(APIDOC_HS_DIR)/index.html: $(HS_LIBTESTBUILT_SRCS) Makefile @test -n "$(HSCOLOUR)" || \ { echo 'HsColour' not found during configure; exit 1; } @test -n "$(HADDOCK)" || \ @@ -1836,40 +2003,36 @@ hs-apidoc: $(HS_BUILT_SRCS) rm -rf $(APIDOC_HS_DIR)/* for i in $(ALL_APIDOC_HS_DIRS); do \ @mkdir_p@ $$i; \ + $(HSCOLOUR) -print-css > $$i/hscolour.css; \ done - $(HSCOLOUR) -print-css > $(APIDOC_HS_DIR)/Ganeti/hscolour.css - $(LN_S) ../hscolour.css $(APIDOC_HS_DIR)/Ganeti/HTools/hscolour.css - $(LN_S) ../hscolour.css $(APIDOC_HS_DIR)/Ganeti/Confd/hscolour.css set -e ; \ - cd src; \ - if [ "$(HS_NOCURL)" ]; \ - then OPTGHC="--optghc=$(HS_NOCURL)"; \ - else OPTGHC=""; \ - fi; \ + export LC_ALL=en_US.UTF-8; \ + OPTGHC="--optghc=-isrc --optghc=-itest/hs"; \ if [ "$(HS_PARALLEL3)" ]; \ then OPTGHC="$$OPTGHC --optghc=$(HS_PARALLEL3)"; \ fi; \ if [ "$(HS_REGEX_PCRE)" ]; \ then OPTGHC="$$OPTGHC --optghc=$(HS_REGEX_PCRE)"; \ fi; \ - RELSRCS="$(HS_LIB_SRCS:src/%=%) $(patsubst src/%,%,$(filter src/%,$(HS_BUILT_SRCS)))"; \ - for file in $$RELSRCS; do \ - hfile=`echo $$file|sed 's/\\.hs$$//'`.html; \ - $(HSCOLOUR) -css -anchor $$file > ../$(APIDOC_HS_DIR)/$$hfile ; \ + for file in $(HS_LIBTESTBUILT_SRCS); do \ + f_nosrc=$${file##src/}; \ + f_notst=$${f_nosrc##test/hs/}; \ + f_html=$${f_notst%%.hs}.html; \ + $(HSCOLOUR) -css -anchor $$file > $(APIDOC_HS_DIR)/$$f_html ; \ done ; \ - $(HADDOCK) --odir ../$(APIDOC_HS_DIR) --html --ignore-all-exports -w \ - -t ganeti -p haddock-prologue \ + $(HADDOCK) --odir $(APIDOC_HS_DIR) --html --ignore-all-exports -w \ + -t ganeti -p src/haddock-prologue \ --source-module="%{MODULE/.//}.html" \ --source-entity="%{MODULE/.//}.html#%{NAME}" \ $$OPTGHC \ - $(filter-out Ganeti/HTools/ExtLoader.hs,$(HS_LIB_SRCS:src/%=%)) + $(HS_LIBTESTBUILT_SRCS) .PHONY: TAGS TAGS: $(GENERATED_FILES) rm -f TAGS $(GHC) -e ":etags" -v0 \ $(filter-out -O -Werror,$(HFLAGS)) \ - $(HS_NOCURL) $(HS_PARALLEL3) $(HS_REGEX_PCRE) \ + $(HS_PARALLEL3) $(HS_REGEX_PCRE) \ $(HS_LIBTEST_SRCS) find . -path './lib/*.py' -o -path './scripts/gnt-*' -o \ -path './daemons/ganeti-*' -o -path './tools/*' -o \ @@ -1877,11 +2040,16 @@ TAGS: $(GENERATED_FILES) etags -l python -a - .PHONY: coverage + +COVERAGE_TESTS= if WANT_HTOOLS -coverage: py-coverage hs-coverage -else -coverage: py-coverage +COVERAGE_TESTS += hs-coverage endif +if PY_UNIT +COVERAGE_TESTS += py-coverage +endif + +coverage: $(COVERAGE_TESTS) .PHONY: py-coverage py-coverage: $(GENERATED_FILES) $(python_tests) @@ -1923,7 +2091,12 @@ live-test: all --srcdir=.. $(HPCEXCL) ; \ hpc report --srcdir=.. live-test $(HPCEXCL) -commit-check: distcheck lint apidoc +commit-check: autotools-check distcheck lint apidoc + +autotools-check: + TESTDATA_DIR=./test/data shelltest $(SHELLTESTARGS) \ + $(abs_top_srcdir)/test/autotools/*-*.test \ + -- --hide-successes .PHONY: gitignore-check gitignore-check: