(2.10) KVM: use running HVPs to calc blockdev options

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2c87d77..a2e8202 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,6 +121,7 @@ DIRS = \
        lib/watcher \
        man \
        qa \
+       qa/patch \
        test \
        test/data \
        test/data/bdev-rbd \
@@ -195,6 +196,9 @@ CLEANFILES = \
        $(man_MANS) \
        $(manhtml) \
        tools/kvm-ifup \
+       tools/kvm-ifdown \
+       tools/vif-ganeti \
+       tools/net-common \
        tools/users-setup \
        tools/vcluster-setup \
        stamp-directories \
@@ -809,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 \
@@ -937,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)
 
@@ -972,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 \
@@ -1125,6 +1136,7 @@ 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 \
@@ -1382,6 +1394,18 @@ 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'; \