Merge lp:~james-page/charms/trusty/cinder/umount-mnt into lp:~openstack-charmers-archive/charms/trusty/cinder/next

[James Page]

[James Page (james-page)]

A recent charm-helpers change fixed the cinder charm so that ephemeral storage mounted on /mnt now correctly gets detected as in use storage.

This MP steals a concept from the ceph charm, supporting explicit umount of a single filesystem to support use in testing.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7486 cinder-next for james-page mp266803
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7486/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #6943 cinder-next for james-page mp266803
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/6943/

[Marco Ceppi (marcoceppi)]

LGTM +1

review: Approve

[Ryan Beisner (1chb1n)]

+1!

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-07-22 19:11:00 +0000
+++ config.yaml	2015-08-03 20:20:00 +0000
@@ -108,6 +108,16 @@
       If True, charm will attempt to remove missing physical volumes from
       volume group, even when logical volumes are allocated on them. This
       option overrides 'remove-missing' when set.
+  ephemeral-unmount:
+    type: string
+    default:
+    description: |
+      Cloud instances provide ephermeral storage which is normally mounted
+      on /mnt.
+      .
+      Providing this option will force an unmount of the ephemeral device
+      so that it can be used as a Cinder storage device.  This is useful for
+      testing purposes (cloud deployment is not a typical use case).
   database-user:
     default: cinder
     type: string

=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2015-07-21 19:28:23 +0000
+++ hooks/cinder_hooks.py	2015-08-03 20:20:00 +0000
@@ -26,6 +26,7 @@
     ceph_config_file,
     setup_ipv6,
     check_db_initialised,
+    filesystem_mounted,
 )
 
 from charmhelpers.core.hookenv import (
@@ -53,6 +54,7 @@
     lsb_release,
     restart_on_change,
     service_reload,
+    umount,
 )
 
 from charmhelpers.contrib.openstack.utils import (
@@ -123,6 +125,10 @@
         sync_db_with_multi_ipv6_addresses(config('database'),
                                           config('database-user'))
 
+    e_mountpoint = conf['ephemeral-unmount']
+    if e_mountpoint and filesystem_mounted(e_mountpoint):
+        umount(e_mountpoint)
+
     if (service_enabled('volume') and
             conf['block-device'] not in [None, 'None', 'none']):
         block_devices = conf['block-device'].split()

=== modified file 'hooks/cinder_utils.py'
--- hooks/cinder_utils.py	2015-07-27 15:49:26 +0000
+++ hooks/cinder_utils.py	2015-08-03 20:20:00 +0000
@@ -796,3 +796,7 @@
     service_restart('tgtd')
 
     [service_restart(s) for s in services()]
+
+
+def filesystem_mounted(fs):
+    return subprocess.call(['grep', '-wqs', fs, '/proc/mounts']) == 0

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-07-13 16:07:29 +0000
+++ tests/basic_deployment.py	2015-08-03 20:20:00 +0000
@@ -68,7 +68,8 @@
         """Configure all of the services."""
         cinder_config = {'block-device': 'vdb',
                          'glance-api-version': '2',
-                         'overwrite': 'true'}
+                         'overwrite': 'true',
+                         'ephemeral-unmount': '/mnt'}
         if self.git:
             amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')