man gnt-cluster: mention ipolicy check

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 568bdab..b109e5b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -212,6 +212,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
@@ -225,7 +226,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
@@ -254,6 +255,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 \
@@ -473,6 +475,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 \
@@ -499,6 +502,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
@@ -550,6 +554,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 \
@@ -776,14 +781,17 @@ endif
 # 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 \
        $(manhtml)
 
+if HAS_SPHINX
 if MANPAGES_IN_DOC
 noinst_DATA += doc/man-html
+else
+noinst_DATA += doc/html
+endif
 endif
 
 gnt_scripts = \
@@ -904,7 +912,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
@@ -1020,6 +1032,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 \
@@ -1117,6 +1130,7 @@ TEST_FILES = \
        test/data/bdev-drbd-8.0.txt \
        test/data/bdev-drbd-8.3.txt \
        test/data/bdev-drbd-8.4.txt \
+       test/data/bdev-drbd-8.4-no-disk-params.txt \
        test/data/bdev-drbd-disk.txt \
        test/data/bdev-drbd-net-ip4.txt \
        test/data/bdev-drbd-net-ip6.txt \
@@ -1219,6 +1233,8 @@ python_tests = \
        test/py/ganeti.client.gnt_instance_unittest.py \
        test/py/ganeti.client.gnt_job_unittest.py \
        test/py/ganeti.cmdlib_unittest.py \
+       test/py/ganeti.cmdlib.cluster_unittest.py \
+       test/py/ganeti.cmdlib.instance_storage_unittest.py \
        test/py/ganeti.compat_unittest.py \
        test/py/ganeti.confd.client_unittest.py \
        test/py/ganeti.config_unittest.py \
@@ -1301,8 +1317,8 @@ dist_TESTS = \
        test/py/cli-test.bash \
        test/py/bash_completion.bash
 
-if !PY_NODEV
-       dist_TESTS += $(python_tests)
+if PY_UNIT
+dist_TESTS += $(python_tests)
 endif
 
 nodist_TESTS =
@@ -1353,8 +1369,8 @@ all_python_code = \
        $(noinst_PYTHON) \
        $(qa_scripts)
 
-if !PY_NODEV
-       all_python_code += $(python_tests)
+if PY_UNIT
+all_python_code += $(python_tests)
 endif
 
 srclink_files = \
@@ -1577,7 +1593,6 @@ lib/_autoconf.py: Makefile | stamp-directories
          echo "XEN_INITRD = '$(XEN_INITRD)'"; \
          echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \
          echo "SHARED_FILE_STORAGE_DIR = '$(SHARED_FILE_STORAGE_DIR)'"; \
-         echo "ENABLE_SHARED_FILE_STORAGE = $(ENABLE_SHARED_FILE_STORAGE)"; \
          echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \
          echo "KVM_PATH = '$(KVM_PATH)'"; \
          echo "IP_PATH = '$(IP_PATH)'"; \
@@ -1600,6 +1615,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)'"; \
@@ -1680,11 +1697,13 @@ $(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#@''GNTLUXIDGROUP@#$(LUXID_GROUP)#g'; \
          echo 's#@''GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \
          echo 's#@''GNTMONDGROUP@#$(MOND_GROUP)#g'; \
          echo 's#@''GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
@@ -2052,7 +2071,7 @@ COVERAGE_TESTS=
 if WANT_HTOOLS
 COVERAGE_TESTS += hs-coverage
 endif
-if !PY_NODEV
+if PY_UNIT
 COVERAGE_TESTS += py-coverage
 endif