Juju Charms Collection
ceph-radosgw package

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

  1. Trusty Tahr (14.04)
  2. lp1520236
  3. Merge into next
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 52
Proposed branch: lp:~hopem/charms/trusty/ceph-radosgw/lp1520236
Merge into: lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/next
Diff against target: 69 lines (+12/-3)
4 files modified
config.yaml (+4/-0)
hooks/ceph_radosgw_context.py (+1/-0)
templates/ceph.conf (+1/-0)
unit_tests/test_ceph_radosgw_context.py (+6/-3)
To merge this branch: bzr merge lp:~hopem/charms/trusty/ceph-radosgw/lp1520236
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+278705@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 #14420 ceph-radosgw-next for hopem mp278705
    LINT OK: passed

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

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

charm_unit_test #13442 ceph-radosgw-next for hopem mp278705
    UNIT OK: passed

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

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

charm_lint_check #14421 ceph-radosgw-next for hopem mp278705
    LINT OK: passed

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

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

charm_unit_test #13443 ceph-radosgw-next for hopem mp278705
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/13515035/
Build: http://10.245.162.77:8080/job/charm_unit_test/13443/

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

charm_amulet_test #8035 ceph-radosgw-next for hopem mp278705
    AMULET FAIL: amulet-test failed

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

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

lp:~hopem/charms/trusty/ceph-radosgw/lp1520236 updated
52. By Edward Hope-Morley

[hopem,r=]

Add debug and verbose config options.
Closes-Bug: 1520236

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

charm_amulet_test #8036 ceph-radosgw-next for hopem mp278705
    AMULET OK: passed

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

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

charm_lint_check #14422 ceph-radosgw-next for hopem mp278705
    LINT OK: passed

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

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

charm_unit_test #13444 ceph-radosgw-next for hopem mp278705
    UNIT OK: passed

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

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

charm_amulet_test #8037 ceph-radosgw-next for hopem mp278705
    AMULET OK: passed

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

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

Approve

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-07-10 14:14:09 +0000
3+++ config.yaml 2015-11-26 16:20:53 +0000
4@@ -1,4 +1,8 @@
5 options:
6+ loglevel:
7+ default: 1
8+ type: int
9+ description: RadosGW debug level. Max is 20.
10 source:
11 type: string
12 default:
13
14=== modified file 'hooks/ceph_radosgw_context.py'
15--- hooks/ceph_radosgw_context.py 2015-10-12 10:56:01 +0000
16+++ hooks/ceph_radosgw_context.py 2015-11-26 16:20:53 +0000
17@@ -99,6 +99,7 @@
18 'old_auth': cmp_pkgrevno('radosgw', "0.51") < 0,
19 'use_syslog': str(config('use-syslog')).lower(),
20 'embedded_webserver': config('use-embedded-webserver'),
21+ 'loglevel': config('loglevel'),
22 }
23
24 if self.context_complete(ctxt):
25
26=== modified file 'templates/ceph.conf'
27--- templates/ceph.conf 2015-11-12 16:31:42 +0000
28+++ templates/ceph.conf 2015-11-26 16:20:53 +0000
29@@ -10,6 +10,7 @@
30 log to syslog = {{ use_syslog }}
31 err to syslog = {{ use_syslog }}
32 clog to syslog = {{ use_syslog }}
33+debug rgw = {{ loglevel }}/5
34
35 [client.radosgw.gateway]
36 host = {{ hostname }}
37
38=== modified file 'unit_tests/test_ceph_radosgw_context.py'
39--- unit_tests/test_ceph_radosgw_context.py 2015-10-12 14:48:38 +0000
40+++ unit_tests/test_ceph_radosgw_context.py 2015-11-26 16:20:53 +0000
41@@ -165,7 +165,8 @@
42 'hostname': '10.0.0.10',
43 'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
44 'old_auth': False,
45- 'use_syslog': 'false'
46+ 'use_syslog': 'false',
47+ 'loglevel': 1,
48 }
49 self.assertEqual(expect, mon_ctxt())
50
51@@ -197,7 +198,8 @@
52 'hostname': '10.0.0.10',
53 'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
54 'old_auth': False,
55- 'use_syslog': 'false'
56+ 'use_syslog': 'false',
57+ 'loglevel': 1,
58 }
59 self.assertEqual(expect, mon_ctxt())
60
61@@ -221,6 +223,7 @@
62 'hostname': '10.0.0.10',
63 'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
64 'old_auth': False,
65- 'use_syslog': 'false'
66+ 'use_syslog': 'false',
67+ 'loglevel': 1,
68 }
69 self.assertEqual(expect, mon_ctxt())

Subscribers

People subscribed via source and target branches