# 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
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 \
lib/watcher \
man \
qa \
+ qa/patch \
test \
test/data \
test/data/bdev-rbd \
$(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 \
$(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
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
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 \
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 \
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 \
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 \
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 \
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 \
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 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
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/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 \
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 = \
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 \
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
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
myexeclib_SCRIPTS = \
daemons/daemon-util \
tools/kvm-ifup \
+ tools/kvm-ifdown \
+ tools/vif-ganeti \
+ tools/net-common \
$(pkglib_python_scripts) \
$(HS_MYEXECLIB_PROGS)
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 \
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 \
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/gnt-os.8 \
man/gnt-storage.8 \
man/hail.1 \
+ man/harep.1 \
man/hbal.1 \
man/hcheck.1 \
man/hinfo.1 \
$(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-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 \
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 \
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 \
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 \
test/py/gnt-cli.test \
test/py/import-export_unittest-helper
+
python_tests = \
doc/examples/rapi_testutils.py \
test/py/cfgupgrade_unittest.py \
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 =
$(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) \
$(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 \
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 $@
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 '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'; \
$(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 \
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
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)" || \
--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:
projects / ganeti-local / blobdiff