Changes in debian files to include dnshook

* Modify MAC_MASK so that it complies with synnefo implementation.
* Add dns network default tag. This tag triggers dnshook.
* Add public network default tag. This is currently not used.
* Add defaults related to nsupdate.
* Install dnshook in /usr/bin and create links under /etc/ganeti/hooks

Private networks across different Ganeti backends have the
same mac prefix; the first 28 bits. The next 4 correspond to the
backend-id. Currently we have limitation of 16 backends. This
will be removed once MAC generation is done in Synnefo and not
in Ganeti side.

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

diff --git a/debian/install b/debian/install
index 3f5f729..6fdd8c9 100644 (file)
--- a/debian/install
+++ b/debian/install
@@ -5,6 +5,7 @@ vif-custom etc/xen/scripts
 
 fix-net usr/bin
 hooks-log usr/bin
+dnshook usr/bin
 
 common.sh usr/lib/snf-network
 

diff --git a/debian/links b/debian/links
index ac6519f..fe1311e 100644 (file)
--- a/debian/links
+++ b/debian/links
@@ -2,3 +2,11 @@
 /usr/bin/fix-net /etc/ganeti/hooks/instance-migrate-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-failover-post.d/fix-net
+
+/usr/bin/dnshook /etc/ganeti/hooks/instance-create-post.d/dnshook
+/usr/bin/dnshook /etc/ganeti/hooks/instance-remove-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-start-post.d/dnshook
+/usr/bin/dnshook /etc/ganeti/hooks/instance-stop-post.d/dnshook
+/usr/bin/dnshook /etc/ganeti/hooks/instance-reboot-post.d/dnshook

diff --git a/debian/snf-network.default b/debian/snf-network.default
index 4fa4fa3..1a915da 100644 (file)
--- a/debian/snf-network.default
+++ b/debian/snf-network.default
@@ -1,4 +1,4 @@
-MAC_MASK=ff:ff:ff:00:00:00
+MAC_MASK=ff:ff:f0:00:00:00
 
 TAP_CONSTANT_MAC=cc:47:52:4e:45:54 # GRNET in hex :-)
 MAC2EUI64=/usr/bin/mac2eui64
@@ -9,6 +9,20 @@ MAC_FILTERED_TAG=private-filtered
 NFDHCPD_TAG=nfdhcpd
 IP_LESS_ROUTED_TAG=ip-less-routed
 MASQ_TAG=masq
+PUBLIC_TAG=public
+DNS_TAG=public
 
 # Default options for runlocked helper script (uncomment to modify)
 #RUNLOCKED_OPTS="--id 10001 --retry-sec 0.5"
+
+# NS options needed by nsupdate
+# A proper bind configuration is a prerequisite
+# Please see: https://wiki.debian.org/DDNS
+# If one of the following vars are not set dnshook wont do a thing
+# Name server IP/FQDN
+SERVER=
+# zone for the vms
+FZONE=vm.synnefo.live
+# keyfile path to pass to nsupdate with -k option
+# see man page for more info
+KEYFILE=