Merge lp:~xfactor973/charm-helpers/ceph-to-rados-fix into lp:charm-helpers

[Chris Holcombe]

I copy pasted a command from ceph's wiki incorrectly. The ceph command is really a rados command.

[Charles Butler (lazypower)]

+1 LGTM

review: Approve

=== modified file 'charmhelpers/contrib/storage/linux/ceph.py'
--- charmhelpers/contrib/storage/linux/ceph.py	2016-03-04 18:14:29 +0000
+++ charmhelpers/contrib/storage/linux/ceph.py	2016-03-09 18:28:53 +0000
@@ -173,7 +173,7 @@
         elif mode == 'writeback':
             check_call(['ceph', '--id', self.service, 'osd', 'tier', 'cache-mode', cache_pool, 'forward'])
             # Flush the cache and wait for it to return
-            check_call(['ceph', '--id', self.service, '-p', cache_pool, 'cache-flush-evict-all'])
+            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])
             check_call(['ceph', '--id', self.service, 'osd', 'tier', 'remove', self.name, cache_pool])
 
 
=== modified file 'tests/contrib/storage/test_linux_ceph.py'
--- tests/contrib/storage/test_linux_ceph.py	2016-03-04 18:14:29 +0000
+++ tests/contrib/storage/test_linux_ceph.py	2016-03-09 18:28:53 +0000
@@ -221,7 +221,7 @@
         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', '-p', 'cacher', 'cache-flush-evict-all']),
+            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']),
         ])