Merge lp:~james-page/charms/precise/ceph/cuttlefish into lp:~charmers/charms/precise/ceph/trunk

[James Page]

Minor fix for ceph mon creation in ceph >= 0.61.3

ceph-mon --mkfs now requires that both /var/run/ceph and
/var/lib/ceph/mon/ceph-<hostname> are present prior to
being able to create a monfs.

[Adam Gandelman (gandelman-a)]

Works for me, testing across the last 3 ceph versions and gets me going with 0.61.3.

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-06-10 13:46:24 +0000
+++ hooks/hooks.py	2013-06-20 21:40:30 +0000
@@ -125,8 +125,9 @@
 
 def bootstrap_monitor_cluster():
     hostname = utils.get_unit_hostname()
-    done = '/var/lib/ceph/mon/ceph-{}/done'.format(hostname)
-    upstart = '/var/lib/ceph/mon/ceph-{}/upstart'.format(hostname)
+    path = '/var/lib/ceph/mon/ceph-{}'.format(hostname)
+    done = '{}/done'.format(path)
+    upstart = '{}/upstart'.format(path)
     secret = utils.config_get('monitor-secret')
     keyring = '/var/lib/ceph/tmp/{}.mon.keyring'.format(hostname)
 
@@ -134,6 +135,10 @@
         utils.juju_log('INFO',
                        'bootstrap_monitor_cluster: mon already initialized.')
     else:
+        # Ceph >= 0.61.3 needs this for ceph-mon fs creation
+        os.makedirs('/var/run/ceph', mode=0755)
+        os.makedirs(path)
+        # end changes for Ceph >= 0.61.3
         try:
             subprocess.check_call(['ceph-authtool', keyring,
                                    '--create-keyring', '--name=mon.',