<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -2,14 +2,21 @@
 Capistrano::Configuration.instance(:must_exist).load do 
   namespace :deprec do
     namespace :xen do
+            
+      desc &quot;Install Xen&quot;
+      task :install, :roles =&gt; :dom0 do
+        install_deps
+        enable_hardy_domu
+      end
       
-      # Config variables for migration
-      default(:xen_slice) { Capistrano::CLI.ui.ask(&quot;Slice name&quot;) }
-      default(:xen_old_host) { Capistrano::CLI.ui.ask(&quot;Old Xen host&quot;) }
-      default(:xen_new_host) { Capistrano::CLI.ui.ask(&quot;New Xen host&quot;) }
-      set(:xen_disk_size) { Capistrano::CLI.ui.ask(&quot;Disk size (GB)&quot;) }
-      set(:xen_swap_size) { Capistrano::CLI.ui.ask(&quot;Swap size (GB)&quot;) }
+      task :install_deps, :roles =&gt; :dom0 do
+        # for amd64 version of ubuntu 7.10
+        apt.install( {:base =&gt; %w(linux-image-xen bridge-utils libxen3.1 python-xen-3.1 xen-docs-3.1 xen-hypervisor-3.1 xen-ioemu-3.1 xen-tools xen-utils-3.1 lvm2)}, :stable )
+        # alternatively, for x86 version of ubuntu:
+        # apt-get install ubuntu-xen-server libc6-xen    
+      end
       
+      # Includes some hacks to get xen-tools working on Ubuntu gutsy
       # ref: http://www.eadz.co.nz/blog/article/xen-gutsy.html
       
       SYSTEM_CONFIG_FILES[:xen] = [
@@ -53,20 +60,7 @@ Capistrano::Configuration.instance(:must_exist).load do
          :owner =&gt; 'root:root'}
          
       ]
-      
-      desc &quot;Install Xen&quot;
-      task :install, :roles =&gt; :dom0 do
-        install_deps
-        enable_hardy_domu
-      end
-      
-      task :install_deps, :roles =&gt; :dom0 do
-        # for amd64 version of ubuntu 7.10
-        apt.install( {:base =&gt; %w(linux-image-xen bridge-utils libxen3.1 python-xen-3.1 xen-docs-3.1 xen-hypervisor-3.1 xen-ioemu-3.1 xen-tools xen-utils-3.1 lvm2)}, :stable )
-        # alternatively, for x86 version of ubuntu:
-        # apt-get install ubuntu-xen-server libc6-xen    
-      end
-      
+            
       desc &quot;Generate configuration file(s) for Xen from template(s)&quot;
       task :config_gen do
         SYSTEM_CONFIG_FILES[:xen].each do |file|
@@ -113,6 +107,16 @@ Capistrano::Configuration.instance(:must_exist).load do
         sudo &quot;xm info&quot;
       end
 
+      # Handy commands for migrating a slice between servers
+      # Not as fast and effortless as I had hoped! -Mike
+      
+      # Config variables for migration
+      default(:xen_slice) { Capistrano::CLI.ui.ask(&quot;Slice name&quot;) }
+      default(:xen_old_host) { Capistrano::CLI.ui.ask(&quot;Old Xen host&quot;) }
+      default(:xen_new_host) { Capistrano::CLI.ui.ask(&quot;New Xen host&quot;) }
+      set(:xen_disk_size) { Capistrano::CLI.ui.ask(&quot;Disk size (GB)&quot;) }
+      set(:xen_swap_size) { Capistrano::CLI.ui.ask(&quot;Swap size (GB)&quot;) }
+      
       desc &quot;Migrate a slice on one Xen host to another. Slice is stopped, disk is tar'd up and transferred to new host.&quot;
       task :migrate do
 
@@ -125,7 +129,6 @@ Capistrano::Configuration.instance(:must_exist).load do
         build_slice_from_tarball
       end
 
-
       task :copy_disk do
         mnt_dir = &quot;/mnt/#{xen_slice}-disk&quot;
       	tarball = &quot;/tmp/#{xen_slice}-disk.tar&quot;
@@ -179,6 +182,8 @@ Capistrano::Configuration.instance(:must_exist).load do
         sudo &quot;umount #{mnt_dir}&quot;, :hosts =&gt; xen_new_host
         sudo &quot;rmdir #{mnt_dir}&quot;, :hosts =&gt; xen_new_host
       end
+      #
+      # end of migration tasks
       
       desc &quot;Enable hardy heron domU's on gutsy dom0&quot;
       task :enable_hardy_domu, :roles =&gt; :dom0 do</diff>
      <filename>lib/deprec/recipes/xen.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>6cd634f62deae5ac20978d85991a22cca9bed110</id>
    </parent>
  </parents>
  <author>
    <name>Mike Bailey</name>
    <email>mike@bailey.net.au</email>
  </author>
  <url>http://github.com/mbailey/deprec/commit/d221905573969c8cdb40b8a8637d4cd5244d3e22</url>
  <id>d221905573969c8cdb40b8a8637d4cd5244d3e22</id>
  <committed-date>2008-08-29T08:02:47-07:00</committed-date>
  <authored-date>2008-08-29T08:02:47-07:00</authored-date>
  <message>Rearranged task order</message>
  <tree>59399c27bb396010f91028dec0a0e8823631b763</tree>
  <committer>
    <name>Mike Bailey</name>
    <email>mike@bailey.net.au</email>
  </committer>
</commit>
