Juju Charms Collection
ceph package

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

  1. Trusty Tahr (14.04)
  2. lp1520236
  3. Merge into next
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 128
Proposed branch: lp:~hopem/charms/trusty/ceph/lp1520236
Merge into: lp:~openstack-charmers-archive/charms/trusty/ceph/next
Diff against target: 37 lines (+7/-0)
3 files modified
config.yaml (+4/-0)
hooks/ceph_hooks.py (+1/-0)
templates/ceph.conf (+2/-0)
To merge this branch: bzr merge lp:~hopem/charms/trusty/ceph/lp1520236
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+282434@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #17242 ceph-next for hopem mp282434
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #16109 ceph-next for hopem mp282434
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #8748 ceph-next for hopem mp282434
    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/14486746/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8748/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #8757 ceph-next for hopem mp282434
    AMULET OK: passed

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

Revision history for this message
Liam Young (gnuoy) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2015-11-23 09:13:18 +0000
3+++ config.yaml 2016-01-13 12:46:27 +0000
4@@ -1,4 +1,8 @@
5 options:
6+ loglevel:
7+ default: 1
8+ type: int
9+ description: Mon and OSD debug level. Max is 20.
10 fsid:
11 type: string
12 default:
13
14=== modified file 'hooks/ceph_hooks.py'
15--- hooks/ceph_hooks.py 2015-11-23 09:13:18 +0000
16+++ hooks/ceph_hooks.py 2016-01-13 12:46:27 +0000
17@@ -99,6 +99,7 @@
18 'use_syslog': str(config('use-syslog')).lower(),
19 'ceph_public_network': config('ceph-public-network'),
20 'ceph_cluster_network': config('ceph-cluster-network'),
21+ 'loglevel': config('loglevel'),
22 }
23
24 if config('prefer-ipv6'):
25
26=== modified file 'templates/ceph.conf'
27--- templates/ceph.conf 2014-09-29 10:55:42 +0000
28+++ templates/ceph.conf 2016-01-13 12:46:27 +0000
29@@ -14,6 +14,8 @@
30 err to syslog = {{ use_syslog }}
31 clog to syslog = {{ use_syslog }}
32 mon cluster log to syslog = {{ use_syslog }}
33+debug mon = {{ loglevel }}/5
34+debug osd = {{ loglevel }}/5
35
36 {%- if ceph_public_network is string %}
37 public network = {{ ceph_public_network }}

Subscribers

People subscribed via source and target branches