fixed examples and updated documentation

pxe_dust/README.md

@@ -19,7 +19,7 @@ Tested on:
 
 Required: apache2, tftp
 
-Optional (recommended): apt (for `recipe[apt::cacher]`). If you're mixing Debian and Ubuntu there may be conflicts where they have the same filenames but different MD5s (Squeeze and Natty).
+Optional (recommended): apt (for `recipe[apt::cacher]`). If you're mixing Debian and Ubuntu there will be conflicts where they have the same filenames but different MD5s (you can mix Ubuntu versions, just not Debian & Ubuntu).
 
 pxe_dust Data Bag
 =================
@@ -52,7 +52,7 @@ Here are currently supported options available for inclusion in the `default.jso
 * `arch`: Architecture of the netboot.tar.gz to use as the source of pxeboot images, default is 'amd64'.
 * `version`: Ubuntu version of the netboot.tar.gz to use as the source of pxeboot images and full stack clients, default is '10.04'.
 * `domain`: Default domain for nodes, default is none.
-* `run_list`: Default run list for nodes, default is none.
+* `run_list`: Run list for nodes, this value is NOT set as a default and must be explicitly set for all boot types.
 * `netboot_url`: URL of the netboot image to use for OS installation.
 * `bootstrap`: Optional additional bootstrapping configuration.
     `http_proxy`: HTTP proxy, default is none.
@@ -66,7 +66,7 @@ Here are currently supported options available for inclusion in the `default.jso
 * `root`:
     `crypted_password`: SHA512 password for the root user, default 'password'. This is used on Debian since Ubuntu does not have a root.
 
-Additional data bag items may be used to support booting multiple operating systems. Examples are included in the `examples/ubuntu-natty-amd64.json`. Important to note is the use of the `addresses` option to support tftp booting by MAC address (this is currently required for not using the default).
+Additional data bag items may be used to support booting multiple operating systems. Examples of various Ubuntu and Debian installations are included in the `examples` directory. Important to note is the use of the `addresses` option to support tftp booting by MAC address (this is currently required for not using the default) and the explicit need for a `run_list` if one is to be provided.
 
 Templates
 =========

pxe_dust/examples/debian-squeeze-amd64.json

@@ -2,7 +2,7 @@
     "id": "debian-squeeze-amd64",
     "arch": "amd64",
     "version": "6.0.4",
-    "netboot_url": "http://http.us.debian.org/debian/dists/squeeze/main/installer-amd64/current/images/netboot/netboot.tar.gz"
+    "netboot_url": "http://http.us.debian.org/debian/dists/squeeze/main/installer-amd64/current/images/netboot/netboot.tar.gz",
     "root": {
         "crypted_password": "$6$Trby4Y5R$bi90k7uYY5ImXe5MWGFW9kel2BnMCcYO9EnwngTFIXKG2/nWcLKTJZ3verMFnpFbITI9.eHwZ.HR1UPeKbCAV1"
     },

pxe_dust/examples/ubuntu-lucid-amd64.json

@@ -3,7 +3,7 @@
     "arch": "amd64",
     "version": "10.04",
     "netboot_url": "http://archive.ubuntu.com/ubuntu/dists/lucid/main/installer-amd64/current/images/netboot/netboot.tar.gz",
+    "run_list": "role[base]",
     "addresses": {
-        "10:78:d2:c8:b2:51": "ignar"
     }
 }

pxe_dust/examples/ubuntu-maverick-amd64.json

@@ -2,5 +2,9 @@
     "id": "ubuntu-maverick-amd64",
     "arch": "amd64",
     "version": "10.10",
-    "netboot_url": "http://archive.ubuntu.com/ubuntu/dists/maverick/main/installer-amd64/current/images/netboot/netboot.tar.gz"
+    "netboot_url": "http://archive.ubuntu.com/ubuntu/dists/maverick/main/installer-amd64/current/images/netboot/netboot.tar.gz",
+    "run_list": "role[base]",
+    "addresses": {
+        "10:78:d2:c8:b2:51": "ignar"
+    }
 }

pxe_dust/examples/ubuntu-natty-amd64.json

@@ -3,8 +3,7 @@
     "arch": "amd64",
     "version": "11.04",
     "netboot_url": "http://archive.ubuntu.com/ubuntu/dists/natty/main/installer-amd64/current/images/netboot/netboot.tar.gz",
+    "run_list": "role[base]",
     "addresses": {
-        "10:78:d2:c8:b4:65": "crushinator",
-        "10:78:d2:c8:b2:07": "larry"
     }
 }

pxe_dust/examples/ubuntu-oneiric-amd64.json

@@ -3,6 +3,7 @@
     "arch": "amd64",
     "version": "11.10",
     "netboot_url": "http://archive.ubuntu.com/ubuntu/dists/oneiric/main/installer-amd64/current/images/netboot/netboot.tar.gz",
+    "run_list": "role[base]",
     "addresses": {
         "10:78:d2:c8:b4:65": "walt"
     }

pxe_dust/templates/default/debian-preseed.cfg.erb

@@ -31,13 +31,19 @@ d-i grub-installer/with_other_os boolean true
 d-i debian-installer/splash	boolean false
 
 ## Package installation
-d-i pkgsel/install-language-support	boolean false
 d-i base-installer/kernel/override-image string linux-server
+d-i pkgsel/include string openssh-server ntp
+d-i pkgsel/install-language-support	boolean false
 d-i pkgsel/update-policy select unattended-upgrades
 d-i pkgsel/upgrade select safe-upgrade
-tasksel tasksel/first multiselect none
 popularity-contest popularity-contest/participate boolean true
-d-i pkgsel/include string openssh-server ntp ntpdate
+tasksel tasksel/first multiselect none
+# d-i apt-setup/backports boolean true
+# d-i apt-setup/contrib boolean true
+# d-i apt-setup/multiverse boolean true
+# d-i apt-setup/non-free boolean true
+# d-i apt-setup/proposed boolean true
+# d-i apt-setup/universe boolean true
 
 ### Account setup
 # configure users