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

Proposed by Clint Byrum
Status: Merged
Merge reported by: Scott Moser
Merged at revision: not available
Proposed branch: lp:~clint-fewbar/ubuntu/maverick/cloud-init/glusterfs-mount-example
Merge into: lp:ubuntu/maverick/cloud-init
Diff against target: 42 lines (+24/-0) (has conflicts)
2 files modified
debian/changelog (+9/-0)
doc/examples/cloud-config-gluster.txt (+15/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~clint-fewbar/ubuntu/maverick/cloud-init/glusterfs-mount-example
Reviewer Review Type Date Requested Status
Mathias Gug Disapprove
Ubuntu branches Pending
Review via email: mp+29490@code.launchpad.net

Description of the change

Adding example file for mounting glusterfs volumes.

To post a comment you must log in.
Revision history for this message
Mathias Gug (mathiaz) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-07-07 15:56:17 +0000
3+++ debian/changelog 2010-07-08 18:35:55 +0000
4@@ -1,9 +1,18 @@
5+<<<<<<< TREE
6 cloud-init (0.5.12-0ubuntu4) maverick; urgency=low
7
8 * handle hostname managing better with ebs root. (LP: #596993)
9
10 -- Scott Moser <smoser@ubuntu.com> Wed, 07 Jul 2010 11:54:10 -0400
11
12+=======
13+cloud-init (0.5.12-0ubuntu4) maverick; urgency=low
14+
15+ * adding cloud-config example for mounting glusterfs
16+
17+ -- Clint Byrum <clint@ubuntu.com> Thu, 08 Jul 2010 11:29:51 -0700
18+
19+>>>>>>> MERGE-SOURCE
20 cloud-init (0.5.12-0ubuntu3) maverick; urgency=low
21
22 * fix cloud-boothook input type (LP: #600799)
23
24=== added file 'doc/examples/cloud-config-gluster.txt'
25--- doc/examples/cloud-config-gluster.txt 1970-01-01 00:00:00 +0000
26+++ doc/examples/cloud-config-gluster.txt 2010-07-08 18:35:55 +0000
27@@ -0,0 +1,15 @@
28+#cloud-config
29+# vim: syntax=yaml
30+# Mounts volfile exported by glusterfsd running on
31+# "volfile-server-hostname" onto the local mount point '/mnt/data'
32+#
33+# In reality, replace 'volfile-server-hostname' with one of your nodes
34+# running glusterfsd.
35+#
36+packages:
37+ - glusterfs-client
38+
39+runcmd:
40+ - [ modprobe, fuse ]
41+ - [ mkdir, '-p', /mnt/data ]
42+ - [ /usr/sbin/glusterfs, '--volfile-server=volfile-server-hostname', '/mnt/data' ]

Subscribers

People subscribed via source and target branches

to all changes: