Merge lp:~clint-fewbar/ubuntu/maverick/cloud-init/glusterfs-mount-example into lp:ubuntu/maverick/cloud-init

[Clint Byrum]

Adding example file for mounting glusterfs volumes.

[Mathias Gug (mathiaz)]

The patch looks good. I'd suggest to submit it to the upstream project (https://code.launchpad.net/cloud-init) instead of the ubuntu package.

review: Disapprove

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-07 15:56:17 +0000
+++ debian/changelog	2010-07-08 18:35:55 +0000
@@ -1,9 +1,18 @@
+<<<<<<< TREE
 cloud-init (0.5.12-0ubuntu4) maverick; urgency=low
 
   * handle hostname managing better with ebs root. (LP: #596993)
 
  -- Scott Moser <[e-mail]>  Wed, 07 Jul 2010 11:54:10 -0400
 
+=======
+cloud-init (0.5.12-0ubuntu4) maverick; urgency=low
+
+  * adding cloud-config example for mounting glusterfs
+
+ -- Clint Byrum <[e-mail]>  Thu, 08 Jul 2010 11:29:51 -0700
+
+>>>>>>> MERGE-SOURCE
 cloud-init (0.5.12-0ubuntu3) maverick; urgency=low
 
   * fix cloud-boothook input type (LP: #600799)

=== added file 'doc/examples/cloud-config-gluster.txt'
--- doc/examples/cloud-config-gluster.txt	1970-01-01 00:00:00 +0000
+++ doc/examples/cloud-config-gluster.txt	2010-07-08 18:35:55 +0000
@@ -0,0 +1,15 @@
+#cloud-config
+# vim: syntax=yaml
+# Mounts volfile exported by glusterfsd running on 
+# "volfile-server-hostname" onto the local mount point '/mnt/data'
+#
+# In reality, replace 'volfile-server-hostname' with one of your nodes
+# running glusterfsd.
+#
+packages:
+ - glusterfs-client
+
+runcmd:
+ - [ modprobe, fuse ]
+ - [ mkdir, '-p', /mnt/data ]
+ - [ /usr/sbin/glusterfs, '--volfile-server=volfile-server-hostname', '/mnt/data' ]