Charm Helpers

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

  1. ceph-to-rados-fix
  2. Merge into devel
Proposed by Chris Holcombe on 2016-03-09
Status: Merged
Merged at revision: 547
Proposed branch: lp:~xfactor973/charm-helpers/ceph-to-rados-fix
Merge into: lp:charm-helpers
Diff against target: 25 lines (+2/-2)
2 files modified
charmhelpers/contrib/storage/linux/ceph.py (+1/-1)
tests/contrib/storage/test_linux_ceph.py (+1/-1)
To merge this branch: bzr merge lp:~xfactor973/charm-helpers/ceph-to-rados-fix
Reviewer Review Type Date Requested Status
Charles Butler (community) 2016-03-09 Approve on 2016-03-14
Review via email: mp+288559@code.launchpad.net

Description of the Change

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

To post a comment you must log in.
Charles Butler (lazypower) wrote :

+1 LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/storage/linux/ceph.py'
2--- charmhelpers/contrib/storage/linux/ceph.py 2016-03-04 18:14:29 +0000
3+++ charmhelpers/contrib/storage/linux/ceph.py 2016-03-09 18:28:53 +0000
4@@ -173,7 +173,7 @@
5 elif mode == 'writeback':
6 check_call(['ceph', '--id', self.service, 'osd', 'tier', 'cache-mode', cache_pool, 'forward'])
7 # Flush the cache and wait for it to return
8- check_call(['ceph', '--id', self.service, '-p', cache_pool, 'cache-flush-evict-all'])
9+ check_call(['rados', '--id', self.service, '-p', cache_pool, 'cache-flush-evict-all'])
10 check_call(['ceph', '--id', self.service, 'osd', 'tier', 'remove-overlay', self.name])
11 check_call(['ceph', '--id', self.service, 'osd', 'tier', 'remove', self.name, cache_pool])
12
13
14=== modified file 'tests/contrib/storage/test_linux_ceph.py'
15--- tests/contrib/storage/test_linux_ceph.py 2016-03-04 18:14:29 +0000
16+++ tests/contrib/storage/test_linux_ceph.py 2016-03-09 18:28:53 +0000
17@@ -221,7 +221,7 @@
18 p.remove_cache_tier(cache_pool='cacher')
19 self.check_call.assert_has_calls([
20 call(['ceph', '--id', 'admin', 'osd', 'tier', 'cache-mode', 'cacher', 'forward']),
21- call(['ceph', '--id', 'admin', '-p', 'cacher', 'cache-flush-evict-all']),
22+ call(['rados', '--id', 'admin', '-p', 'cacher', 'cache-flush-evict-all']),
23 call(['ceph', '--id', 'admin', 'osd', 'tier', 'remove-overlay', 'test']),
24 call(['ceph', '--id', 'admin', 'osd', 'tier', 'remove', 'test', 'cacher']),
25 ])

Subscribers

People subscribed via source and target branches