X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/fb3891d0792bde1636592db7b106b447b7366fbe..refs/heads/stable-2.8-grnet-rebased:/Makefile.am diff --git a/Makefile.am b/Makefile.am index 35d1e5d..a2e8202 100644 --- a/Makefile.am +++ b/Makefile.am @@ -100,9 +100,11 @@ DIRS = \ 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 \ @@ -119,6 +121,7 @@ DIRS = \ lib/watcher \ man \ qa \ + qa/patch \ test \ test/data \ test/data/bdev-rbd \ @@ -188,10 +191,14 @@ CLEANFILES = \ $(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 \ @@ -200,6 +207,7 @@ 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 @@ -213,7 +221,7 @@ 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 @@ -242,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 \ @@ -309,9 +318,24 @@ client_PYTHON = \ cmdlib_PYTHON = \ lib/cmdlib/__init__.py \ - lib/cmdlib/common.py \ + lib/cmdlib/backup.py \ lib/cmdlib/base.py \ - lib/cmdlib/tags.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 \ @@ -397,12 +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 \ @@ -435,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 \ @@ -461,6 +488,7 @@ endif 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 @@ -513,6 +541,7 @@ 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 \ @@ -533,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 \ @@ -720,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 = \ @@ -771,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 \ @@ -814,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 @@ -849,7 +892,11 @@ 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 @@ -895,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) @@ -930,7 +980,9 @@ EXTRA_DIST = \ devel/upload \ devel/webserver \ tools/kvm-ifup.in \ - tools/users-setup.in \ + tools/kvm-ifdown.in \ + tools/vif-ganeti.in \ + tools/net-common.in \ tools/vcluster-setup.in \ $(docinput) \ doc/html \ @@ -941,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 \ @@ -961,6 +1016,7 @@ 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 \ @@ -981,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 \ @@ -1002,11 +1059,14 @@ 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 \ @@ -1015,6 +1075,8 @@ TEST_FILES = \ 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 \ @@ -1074,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 \ @@ -1105,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 \ @@ -1121,6 +1188,7 @@ TEST_FILES = \ test/py/gnt-cli.test \ test/py/import-export_unittest-helper + python_tests = \ doc/examples/rapi_testutils.py \ test/py/cfgupgrade_unittest.py \ @@ -1210,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 = @@ -1244,7 +1315,6 @@ all_python_code = \ $(pkglib_python_scripts) \ $(nodist_pkglib_python_scripts) \ $(nodist_tools_python_scripts) \ - $(python_tests) \ $(pkgpython_PYTHON) \ $(client_PYTHON) \ $(cmdlib_PYTHON) \ @@ -1261,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 \ @@ -1320,10 +1394,40 @@ tools/kvm-ifup: tools/kvm-ifup.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ chmod +x $@ -tools/users-setup: tools/users-setup.in $(REPLACE_VARS_SED) +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 $@ @@ -1498,6 +1602,8 @@ 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)'"; \ @@ -1579,11 +1685,14 @@ $(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'; \ @@ -1694,28 +1803,30 @@ check-local: check-dirs $(GENERATED_FILES) $(CHECK_VERSION) $(VERSION) $(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 \ @@ -1929,12 +2040,17 @@ 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) @test -n "$(PYCOVERAGE)" || \ @@ -1975,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: