Merge lp:~hopem/charms/trusty/ceph-osd/lp1520236 into lp:~openstack-charmers-archive/charms/trusty/ceph-osd/next

[Edward Hope-Morley]

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

charm_unit_test #16108 ceph-osd-next for hopem mp282433
    UNIT OK: passed

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

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

charm_lint_check #17243 ceph-osd-next for hopem mp282433
    LINT OK: passed

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

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

charm_amulet_test #8747 ceph-osd-next for hopem mp282433
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 100
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/14486745/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8747/

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

charm_amulet_test #8749 ceph-osd-next for hopem mp282433
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8749/

[Liam Young (gnuoy)]

Approved

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-07-10 14:12:01 +0000
+++ config.yaml	2016-01-13 12:49:15 +0000
@@ -1,4 +1,8 @@
 options:
+  loglevel:
+    default: 1
+    type: int
+    description: OSD debug level. Max is 20.
   osd-devices:
     type: string
     default: /dev/vdb
 
=== modified file 'hooks/ceph_hooks.py'
--- hooks/ceph_hooks.py	2015-10-30 02:22:54 +0000
+++ hooks/ceph_hooks.py	2016-01-13 12:49:15 +0000
@@ -83,6 +83,7 @@
         'use_syslog': str(config('use-syslog')).lower(),
         'ceph_public_network': config('ceph-public-network'),
         'ceph_cluster_network': config('ceph-cluster-network'),
+        'loglevel': config('loglevel'),
     }
 
     if config('prefer-ipv6'):
 
=== modified file 'templates/ceph.conf'
--- templates/ceph.conf	2014-10-06 22:09:58 +0000
+++ templates/ceph.conf	2016-01-13 12:49:15 +0000
@@ -13,6 +13,7 @@
 log to syslog = {{ use_syslog }}
 err to syslog = {{ use_syslog }}
 clog to syslog = {{ use_syslog }}
+debug osd = {{ loglevel }}/5
 
 {%- if ceph_public_network is string %}
 public network = {{ ceph_public_network }}