Remove method that mounted missing ephemeral disk (it's done in ec2autorun.py instead (if not, this method would mount the new FS over existing data): galaxyproject/ansible-cloudman-image@0566b51)

Author: afgane

cm/services/data/transient_storage.py

@@ -54,9 +54,6 @@ def add(self):
         and exporting it over NFS. Set the owner of the repo as ``ubuntu`` user.
         """
         log.debug("Adding a transient FS at {0}".format(self.fs.mount_point))
-        # transient_nfs gets created first - make sure it's on a dedicated device
-        if self.fs.name == 'transient_nfs' and self.app.cloud_type == 'ec2':
-            self._ensure_ephemeral_disk_mounted()
         misc.make_dir(self.fs.mount_point, owner='ubuntu')
         # Set the device ID
         cmd = "df %s | grep -v Filesystem | awk '{print $1}'" % self.fs.mount_point
@@ -85,25 +82,6 @@ def remove(self):
         self.fs.remove_nfs_share()
         self.fs.state = service_states.SHUT_DOWN
 
-    def _ensure_ephemeral_disk_mounted(self):
-        """
-        Make sure `/mnt` is a mounted device vs. just being part of `/`.
-
-        At least some AWS instance types (e.g., r3) do not auto-mount what's in
-        `/ets/fstab` so make sure the ephemeral disks are in fact mounted.
-        http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html#InstanceStoreTrimSupport
-        """
-        if not misc.run('mountpoint -q /mnt'):
-            device = '/dev/xvdb'  # Most of AWS instances have this device
-            if os.path.exists(device):
-                log.debug("/mnt is not a mountpoint; will try to mount it from {0}"
-                          .format(device))
-                misc.run('mkfs.xfs {0}'.format(device))
-                misc.run('mount -o discard {0} /mnt'.format(device))
-            else:
-                log.warning("Mountpoint /mnt not available and no device {0}"
-                            .format(device))
-
     def status(self):
         """
         Update the status of this data service: ake sure the mount point exists