Fix backup VM name for ldap-3

(and potentially other guests where the name differs from the libvirt
domain name)

site-cookbooks/kosmos_kvm/files/backup_vm.sh

@@ -21,7 +21,7 @@ virsh snapshot-create-as --domain $1  \
 borg create -v --stats  \
         $REPOSITORY::$1_$(date +%F_%H-%M) \
         /var/lib/libvirt/images/$1.qcow2  \
-        /root/backups/vm_meta
+        /root/backups/vm_meta/$1.xml
 
 echo "Pivoting base image back to original"
 virsh blockcommit $1 vda --pivot --base=/var/lib/libvirt/images/$1.qcow2

site-cookbooks/kosmos_kvm/recipes/backup.rb

@@ -24,13 +24,21 @@ export BORG_REPO='#{borg_credentials["repository"]}'
   not_if "grep -q BORG /root/.bashrc"
 end
 
+directory "/root/backups" do
+  mode "0750"
+end
+
+directory "/root/backups/vm_meta" do
+  mode "0750"
+end
+
 cookbook_file "/root/backups/backup_vm.sh" do
   source "backup_vm.sh"
   mode "0750"
 end
 
 # Search all guests and filter by presence on current host
-vm_domains = search(:node, "role:kvm_guest").map(&:name) \
+vm_domains = search(:node, "role:kvm_guest").map{|n| n["hostname"] } \
              & `virsh list --name`.strip.chomp.split("\n")
 
 template "/root/backups/backup_all_vms.sh" do

site-cookbooks/kosmos_kvm/templates/create_vm.erb

@@ -86,6 +86,6 @@ virt-install \
   --graphics none \
   --serial pty \
   --console pty \
-  --channel unix,mode=bind,path=/var/lib/libvirt/qemu/guest01.agent,target_type=virtio,name=org.qemu.guest_agent.0 \
+  --channel unix,mode=bind,path=/var/lib/libvirt/qemu/$VMNAME.guest_agent.0,target_type=virtio,name=org.qemu.guest_agent.0 \
   --autostart \
   --import