Merge lp:~xfactor973/charm-helpers/ceph-configkey-bugfix into lp:charm-helpers

[Chris Holcombe]

I messed up the ceph commands on the config-key set/get/del There's an extra ceph parameter in there that shouldn't be there.

[Charles Butler (lazypower)]

+1 LGTM

review: Approve

=== modified file 'charmhelpers/contrib/storage/linux/ceph.py'
--- charmhelpers/contrib/storage/linux/ceph.py	2016-03-02 18:16:42 +0000
+++ charmhelpers/contrib/storage/linux/ceph.py	2016-03-04 18:17:10 +0000
@@ -271,7 +271,7 @@
     try:
         mon_status = check_output(
             ['ceph', '--id', service,
-             'ceph', 'mon_status', '--format=json'])
+             'mon_status', '--format=json'])
         try:
             return json.loads(mon_status)
         except ValueError as v:
@@ -321,7 +321,7 @@
     try:
         check_output(
             ['ceph', '--id', service,
-             'ceph', 'config-key', 'del', str(key)])
+             'config-key', 'del', str(key)])
     except CalledProcessError as e:
         log("Monitor config-key put failed with message: {}".format(
             e.output))
@@ -339,7 +339,7 @@
     try:
         check_output(
             ['ceph', '--id', service,
-             'ceph', 'config-key', 'put', str(key), str(value)])
+             'config-key', 'put', str(key), str(value)])
     except CalledProcessError as e:
         log("Monitor config-key put failed with message: {}".format(
             e.output))
@@ -356,7 +356,7 @@
     try:
         output = check_output(
             ['ceph', '--id', service,
-             'ceph', 'config-key', 'get', str(key)])
+             'config-key', 'get', str(key)])
         return output
     except CalledProcessError as e:
         log("Monitor config-key get failed with message: {}".format(
 
=== modified file 'tests/contrib/storage/test_linux_ceph.py'
--- tests/contrib/storage/test_linux_ceph.py	2016-03-02 18:16:42 +0000
+++ tests/contrib/storage/test_linux_ceph.py	2016-03-04 18:17:10 +0000
@@ -414,13 +414,13 @@
 
     def test_set_monitor_key(self):
         cmd = ['ceph', '--id', 'admin',
-               'ceph', 'config-key', 'put', 'foo', 'bar']
+               'config-key', 'put', 'foo', 'bar']
         ceph_utils.monitor_key_set(service='admin', key='foo', value='bar')
         self.check_output.assert_called_with(cmd)
 
     def test_get_monitor_key(self):
         cmd = ['ceph', '--id', 'admin',
-               'ceph', 'config-key', 'get', 'foo']
+               'config-key', 'get', 'foo']
         ceph_utils.monitor_key_get(service='admin', key='foo')
         self.check_output.assert_called_with(cmd)
 
@@ -449,7 +449,7 @@
     def test_delete_monitor_key(self):
         ceph_utils.monitor_key_delete(service='admin', key='foo')
         cmd = ['ceph', '--id', 'admin',
-               'ceph', 'config-key', 'del', 'foo']
+               'config-key', 'del', 'foo']
         self.check_output.assert_called_with(cmd)
 
     def test_delete_monitor_key_failed(self):
@@ -463,7 +463,7 @@
     def test_get_monmap(self):
         self.check_output.return_value = MONMAP_DUMP
         cmd = ['ceph', '--id', 'admin',
-               'ceph', 'mon_status', '--format=json']
+               'mon_status', '--format=json']
         ceph_utils.get_mon_map(service='admin')
         self.check_output.assert_called_with(cmd)