deploy: update ganeti and nfqueue packages

Use latest custom 2.8.2 ganeti which consists of ganeti-haskell,
ganeti-htools, snf-ganeti.

nfqueue-bindings-python is replaced by python-nfqueue in
wheezy. Use our custom package which supports an extra method
that returns the physical device the packet arrives from in
case of a bridged setup.
Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>

ci/schemas/one_node_wheezy/wheezy.conf

@@ -40,8 +40,10 @@ snf-tools = wheezy
 
 
 [ganeti]
-snf-ganeti = 2.8.0+hotplug+ippoolfix-1
-ganeti-htools = 2.8.0+hotplug+ippoolfix-1
+snf-ganeti = 2.8.2+hotplug+snapshot+ippoolfix+rapifix+b64v2-1~wheezy
+ganeti-htools = 2.8.2+hotplug+snapshot+ippoolfix+rapifix+b64v2-1~wheezy
+ganeti-haskell = 2.8.2+hotplug+snapshot+ippoolfix+rapifix+b64v2-1~wheezy
+
 [other]
 snf-cloudcms = wheezy
 snf-vncauthproxy = wheezy
@@ -52,4 +54,4 @@ python-objpool = wheezy
 nfdhcpd = wheezy
 kamaki = wheezy
 python-bitarray = wheezy
-nfqueue-bindings-python = 0.4+physindev-1~wheezy
+python-nfqueue = 0.4+physindev-1~wheezy

snf-deploy/conf/wheezy.conf

@@ -40,8 +40,9 @@ snf-tools = wheezy
 
 
 [ganeti]
-snf-ganeti = 2.6.2+ippool11+hotplug5+extstorage3+rbdfix1+kvmfix2+nolvm+netxen-1~wheezy
-ganeti-htools = 2.6.2+ippool11+hotplug5+extstorage3+rbdfix1+kvmfix2+nolvm+netxen-1~wheezy
+snf-ganeti = 2.8.2+hotplug+snapshot+ippoolfix+rapifix+b64v2-1~wheezy
+ganeti-htools = 2.8.2+hotplug+snapshot+ippoolfix+rapifix+b64v2-1~wheezy
+ganeti-haskell = 2.8.2+hotplug+snapshot+ippoolfix+rapifix+b64v2-1~wheezy
 
 [other]
 snf-cloudcms = wheezy
@@ -53,5 +54,4 @@ python-objpool = wheezy
 nfdhcpd = wheezy
 kamaki = wheezy
 python-bitarray = wheezy
-nfqueue-bindings-python = 0.3+physindev-1~wheezy
-
+python-nfqueue = 0.4+physindev-1~wheezy

snf-deploy/snfdeploy/fabfile.py

@@ -887,6 +887,7 @@ def setup_ganeti():
         #try_run("apt-get update")
     install_package("qemu-kvm")
     install_package("python-bitarray")
+    install_package("ganeti-haskell")
     install_package("ganeti-htools")
     install_package("snf-ganeti")
     try_run("mkdir -p /srv/ganeti/file-storage/")
@@ -1087,7 +1088,7 @@ def setup_iptables():
 def setup_network():
     debug(env.host,
           "Setting up networking for Ganeti instances (nfdhcpd, etc.)...")
-    install_package("nfqueue-bindings-python")
+    install_package("python-nfqueue")
     install_package("nfdhcpd")
     tmpl = "/etc/nfdhcpd/nfdhcpd.conf"
     replace = {