Merge lp:~xfactor973/charm-helpers/ceph-jewel-flag into lp:charm-helpers

[Chris Holcombe]

Ceph added a mandatory flag in their jewel release candidate that needs to be added to our cache tier removal calls.

[Ryan Beisner (1chb1n)]

Unit, lint checks OK. --yes-i-really-approve-it

Thanks!

review: Approve

=== modified file 'charmhelpers/contrib/storage/linux/ceph.py'
--- charmhelpers/contrib/storage/linux/ceph.py	2016-04-13 21:45:02 +0000
+++ charmhelpers/contrib/storage/linux/ceph.py	2016-04-15 20:44:26 +0000
@@ -166,12 +166,19 @@
         """
         # read-only is easy, writeback is much harder
         mode = get_cache_mode(self.service, cache_pool)
+        version = ceph_version()
         if mode == 'readonly':
             check_call(['ceph', '--id', self.service, 'osd', 'tier', 'cache-mode', cache_pool, 'none'])
             check_call(['ceph', '--id', self.service, 'osd', 'tier', 'remove', self.name, cache_pool])
 
         elif mode == 'writeback':
-            check_call(['ceph', '--id', self.service, 'osd', 'tier', 'cache-mode', cache_pool, 'forward'])
+            pool_forward_cmd = ['ceph', '--id', self.service, 'osd', 'tier',
+                                'cache-mode', cache_pool, 'forward']
+            if version >= '10.1':
+                # Jewel added a mandatory flag
+                pool_forward_cmd.append('--yes-i-really-mean-it')
+
+            check_call(pool_forward_cmd)
             # Flush the cache and wait for it to return
             check_call(['rados', '--id', self.service, '-p', cache_pool, 'cache-flush-evict-all'])
             check_call(['ceph', '--id', self.service, 'osd', 'tier', 'remove-overlay', self.name])

=== modified file 'tests/contrib/storage/test_linux_ceph.py'
--- tests/contrib/storage/test_linux_ceph.py	2016-04-13 21:45:02 +0000
+++ tests/contrib/storage/test_linux_ceph.py	2016-04-15 20:44:26 +0000
@@ -214,13 +214,16 @@
         ])
 
     @patch.object(ceph_utils, 'get_cache_mode')
-    def test_pool_remove_writeback_cache_tier(self, cache_mode):
+    @patch.object(ceph_utils, 'ceph_version')
+    def test_pool_remove_writeback_cache_tier(self, ceph_version, cache_mode):
         cache_mode.return_value = 'writeback'
+        ceph_version.return_value = '10.1.1'
 
         p = ceph_utils.Pool(name='test', service='admin')
         p.remove_cache_tier(cache_pool='cacher')
         self.check_call.assert_has_calls([
-            call(['ceph', '--id', 'admin', 'osd', 'tier', 'cache-mode', 'cacher', 'forward']),
+            call(['ceph', '--id', 'admin', 'osd', 'tier', 'cache-mode', 'cacher', 'forward',
+                  '--yes-i-really-mean-it']),
             call(['rados', '--id', 'admin', '-p', 'cacher', 'cache-flush-evict-all']),
             call(['ceph', '--id', 'admin', 'osd', 'tier', 'remove-overlay', 'test']),
             call(['ceph', '--id', 'admin', 'osd', 'tier', 'remove', 'test', 'cacher']),