ceph.py: the journal component does not current work with restart

Removing for the time being.

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 1ad8b9067640ed8c02c57fc3bb9b3d8046c0807b..1669bc9f95b918903c4f744c51138ff3c7ac565e 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -227,7 +227,6 @@ def mount_osd_data(ctx, remote, osd):
     log.debug('Mounting data for osd.{o} on {r}'.format(o=osd, r=remote))
     if remote in ctx.disk_config.remote_to_roles_to_dev and osd in ctx.disk_config.remote_to_roles_to_dev[remote]:
         dev = ctx.disk_config.remote_to_roles_to_dev[remote][osd]
-        journal = ctx.disk_config.remote_to_roles_to_journals[remote][osd]
         mount_options = ctx.disk_config.remote_to_roles_to_dev_mount_options[remote][osd]
         fstype = ctx.disk_config.remote_to_roles_to_dev_fstype[remote][osd]
         mnt = os.path.join('/var/lib/ceph/osd', 'ceph-{id}'.format(id=osd))
@@ -246,12 +245,6 @@ def mount_osd_data(ctx, remote, osd):
             ]
             )
 
-        if journal == ('/mnt/osd.%s' % osd):
-            tmpfs = '/mnt/osd.%s' % osd
-            log.info('Creating journal file on tmpfs at {t}'.format(t=tmpfs))
-            remote.run( args=[ 'sudo', 'mount', '-t', 'tmpfs', 'tmpfs', '/mnt' ] )
-            remote.run( args=[ 'truncate', '-s', '1500M', tmpfs ] )
-
 def make_admin_daemon_dir(ctx, remote):
     remote.run(
             args=[