Merge lp:~hopem/charms/precise/ceph/lp1259919 into lp:~charmers/charms/precise/ceph/trunk

[Edward Hope-Morley]

[James Page (james-page)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-08-27 10:44:50 +0000
+++ config.yaml	2013-12-12 11:18:46 +0000
@@ -49,6 +49,17 @@
       no journal device will be used.
       .
       Only supported with ceph >= 0.48.3.
+  osd-journal-size:
+    type: int
+    default: 1024
+    description: |
+      Ceph osd journal size. The journal size should be at least twice the
+      product of the expected drive speed multiplied by filestore max sync
+      interval. However, the most common practice is to partition the journal
+      drive (often an SSD), and mount it such that Ceph uses the entire
+      partition for the journal.
+      .
+      Only supported with ceph >= 0.48.3.
   osd-format:
     type: string
     default: xfs
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-11-18 12:20:21 +0000
+++ hooks/hooks.py	2013-12-12 11:18:46 +0000
@@ -71,7 +71,8 @@
         'auth_supported': config('auth-supported'),
         'mon_hosts': ' '.join(get_mon_hosts()),
         'fsid': config('fsid'),
-        'version': ceph.get_ceph_version()
+        'version': ceph.get_ceph_version(),
+        'osd_journal_size': config('osd-journal-size')
     }
     # Install ceph.conf as an alternative to support
     # co-existence with other charms that write this file
 
=== modified file 'revision'
--- revision	2013-10-10 10:46:24 +0000
+++ revision	2013-12-12 11:18:46 +0000
@@ -1,1 +1,1 @@
-103
+104
 
=== modified file 'templates/ceph.conf'
--- templates/ceph.conf	2012-12-17 10:22:51 +0000
+++ templates/ceph.conf	2013-12-12 11:18:46 +0000
@@ -18,6 +18,6 @@
 
 [osd]
  keyring = /var/lib/ceph/osd/$cluster-$id/keyring
- osd journal size = 1000
+ osd journal size = {{ osd_journal_size }}
  filestore xattr use omap = true