Change default error msg in monitoring

[snf-image] / snf-image-host / Makefile.am

diff --git a/snf-image-host/Makefile.am b/snf-image-host/Makefile.am
index e59c6b2..24ef529 100644 (file)
--- a/snf-image-host/Makefile.am
+++ b/snf-image-host/Makefile.am
@@ -1,32 +1,13 @@
-if PROGMONSUPPORT
-progress_monitor_support=yes
-else
-progress_monitor_support=no
-endif
-
-if PITHOSIMGSUPPORT
-pithos_backend_support=yes
-else
-pithos_backend_support=no
-endif
-
-if NETWORKIMGSUPPORT
-network_backend_support=yes
-else
-network_backend_support=no
-endif
-
 osname=$(PACKAGE)
 osdir=$(OS_DIR)/$(osname)
 defaultdir=$(DEFAULT_DIR)
 variantsdir=${sysconfdir}/ganeti/snf-image/variants
 
 dist_os_SCRIPTS = ${srcdir}/create ${srcdir}/import ${srcdir}/export \
-                       ${srcdir}/rename ${srcdir}/verify
-if PITHOSIMGSUPPORT
-dist_os_SCRIPTS += ${srcdir}/pithcat
-endif
-       
+       ${srcdir}/rename ${srcdir}/verify ${srcdir}/pithcat \
+       ${srcdir}/copy-monitor.py ${srcdir}/helper-monitor.py \
+       ${srcdir}/host-monitor.py ${srcdir}/decode-config.py
+
 dist_os_DATA = ${srcdir}/ganeti_api_version ${srcdir}/parameters.list \
                ${srcdir}/variants.list
 
@@ -41,6 +22,7 @@ edit = sed \
           -e 's|@osname[@]|$(osname)|g' \
           -e 's|@defaultdir[@]|$(defaultdir)|g' \
           -e 's|@HELPER_DIR[@]|$(HELPER_DIR)|g' \
+          -e 's|@HELPER_CACHE_DIR[@]|$(HELPER_CACHE_DIR)|g' \
           -e 's|@HELPER_IMG[@]|$(HELPER_IMG)|g' \
           -e 's|@HELPER_KERNEL[@]|$(HELPER_KERNEL)|g' \
           -e 's|@HELPER_INITRD[@]|$(HELPER_INITRD)|g' \
@@ -53,9 +35,8 @@ edit = sed \
           -e 's|@QEMU_IMG[@]|$(QEMU_IMG)|g' \
           -e 's|@INSTALL_MBR[@]|$(INSTALL_MBR)|g' \
           -e 's|@PROGRESS_MONITOR[@]|$(PROGRESS_MONITOR)|g' \
-          -e 's|@progress_monitor_support[@]|$(progress_monitor_support)|g' \
-          -e 's|@pithos_backend_support[@]|$(pithos_backend_support)|g' \
-          -e 's|@network_backend_support[@]|$(network_backend_support)|g'
+          -e 's|@UNATTEND[@]|$(UNATTEND)|g' \
+           -e 's|@MULTISTRAP_CONFIG[@]|$(MULTISTRAP_CONFIG)|g'
 
 %:%.in Makefile
        rm -f $@ $@.tmp