Changes in debian files

- install: kvm-ifup-custom, kvm-ifdown-custom
- default: SNF_NETWORK_LOG, LOGFILE, TTL
- links: kvm-vif-bridge

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>

diff --git a/debian/install b/debian/install
index d90e3bd..c61f465 100644 (file)
--- a/debian/install
+++ b/debian/install
@@ -1,12 +1,13 @@
 mac2eui64 usr/bin
 
-kvm-vif-bridge etc/ganeti
+kvm-ifup-custom etc/ganeti
+kvm-ifdown-custom etc/ganeti
 ifup-extra etc/ganeti
 vif-custom etc/xen/scripts
 
-fix-net usr/bin
-hooks-log usr/bin
-dnshook usr/bin
+snf-network-hook usr/bin
+snf-network-log usr/bin
+snf-network-dnshook usr/bin
 
 common.sh usr/lib/snf-network
 

diff --git a/debian/links b/debian/links
index fed38cc..e7e6c47 100644 (file)
--- a/debian/links
+++ b/debian/links
@@ -1,12 +1,14 @@
-/usr/bin/fix-net /etc/ganeti/hooks/instance-remove-post.d/fix-net
-/usr/bin/fix-net /etc/ganeti/hooks/instance-stop-post.d/fix-net
-/usr/bin/fix-net /etc/ganeti/hooks/instance-migrate-post.d/fix-net
-/usr/bin/fix-net /etc/ganeti/hooks/instance-failover-post.d/fix-net
+/usr/bin/snf-network-hook /etc/ganeti/hooks/instance-remove-post.d/snf-network-hook
+/usr/bin/snf-network-hook /etc/ganeti/hooks/instance-stop-post.d/snf-network-hook
+/usr/bin/snf-network-hook /etc/ganeti/hooks/instance-migrate-post.d/snf-network-hook
+/usr/bin/snf-network-hook /etc/ganeti/hooks/instance-failover-post.d/snf-network-hook
 
-/usr/bin/dnshook /etc/ganeti/hooks/instance-add-post.d/dnshook
-/usr/bin/dnshook /etc/ganeti/hooks/instance-modify-post.d/dnshook
-/usr/bin/dnshook /etc/ganeti/hooks/instance-rename-post.d/dnshook
-/usr/bin/dnshook /etc/ganeti/hooks/instance-remove-post.d/dnshook
-/usr/bin/dnshook /etc/ganeti/hooks/instance-start-post.d/dnshook
-/usr/bin/dnshook /etc/ganeti/hooks/instance-reboot-post.d/dnshook
-/usr/bin/dnshook /etc/ganeti/hooks/instance-stop-post.d/dnshook
+/usr/bin/snf-network-dnshook /etc/ganeti/hooks/instance-add-post.d/snf-network-dnshook
+/usr/bin/snf-network-dnshook /etc/ganeti/hooks/instance-modify-post.d/snf-network-dnshook
+/usr/bin/snf-network-dnshook /etc/ganeti/hooks/instance-rename-post.d/snf-network-dnshook
+/usr/bin/snf-network-dnshook /etc/ganeti/hooks/instance-remove-post.d/snf-network-dnshook
+/usr/bin/snf-network-dnshook /etc/ganeti/hooks/instance-start-post.d/snf-network-dnshook
+/usr/bin/snf-network-dnshook /etc/ganeti/hooks/instance-reboot-post.d/snf-network-dnshook
+/usr/bin/snf-network-dnshook /etc/ganeti/hooks/instance-stop-post.d/snf-network-dnshook
+
+/etc/ganeti/kvm-ifup-custom /etc/ganeti/kvm-vif-bridge

diff --git a/debian/snf-network.default b/debian/snf-network.default
index 72f8585..52e5f03 100644 (file)
--- a/debian/snf-network.default
+++ b/debian/snf-network.default
@@ -1,3 +1,5 @@
+SNF_NETWORK_LOG=/usr/bin/snf-network-log
+LOGFILE=/var/log/ganeti/snf-network.log
 IFUP_EXTRA_SCRIPT=/etc/ganeti/ifup-extra
 
 MAC_MASK=ff:ff:f0:00:00:00
@@ -28,3 +30,5 @@ FZONE=vm.synnefo.live
 # keyfile path to pass to nsupdate with -k option
 # see man page for more info
 KEYFILE=
+# TTL for the dns entries
+TTL=300