Juju Charms Collection
ceph-radosgw package

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

  1. Trusty Tahr (14.04)
  2. lp1515387
  3. Merge into next
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 55
Proposed branch: lp:~hopem/charms/trusty/ceph-radosgw/lp1515387
Merge into: lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/next
Diff against target: 58 lines (+11/-1)
3 files modified
hooks/ceph_radosgw_context.py (+7/-0)
templates/ceph.conf (+1/-1)
unit_tests/test_ceph_radosgw_context.py (+3/-0)
To merge this branch: bzr merge lp:~hopem/charms/trusty/ceph-radosgw/lp1515387
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Chris MacNaughton (community) Approve
Review via email: mp+279257@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 #14753 ceph-radosgw-next for hopem mp279257
    LINT OK: passed

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

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

charm_unit_test #13756 ceph-radosgw-next for hopem mp279257
    UNIT OK: passed

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

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

charm_amulet_test #8073 ceph-radosgw-next for hopem mp279257
    AMULET FAIL: amulet-test failed

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

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

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

synced /next

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

charm_lint_check #15768 ceph-radosgw-next for hopem mp279257
    LINT OK: passed

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

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

charm_unit_test #14716 ceph-radosgw-next for hopem mp279257
    UNIT OK: passed

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

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

charm_amulet_test #8382 ceph-radosgw-next for hopem mp279257
    AMULET OK: passed

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

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

charm_lint_check #16578 ceph-radosgw-next for hopem mp279257
    LINT OK: passed

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

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

charm_unit_test #15482 ceph-radosgw-next for hopem mp279257
    UNIT OK: passed

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

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

charm_amulet_test #8506 ceph-radosgw-next for hopem mp279257
    AMULET OK: passed

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

Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

Thanks for this merge proposal, Edward! Looks good to me!

review: Approve
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 'hooks/ceph_radosgw_context.py'
2--- hooks/ceph_radosgw_context.py 2015-11-26 16:20:26 +0000
3+++ hooks/ceph_radosgw_context.py 2015-12-21 17:41:22 +0000
4@@ -102,6 +102,13 @@
5 'loglevel': config('loglevel'),
6 }
7
8+ if (config('use-ceph-optimised-packages') and
9+ not config('use-embedded-webserver')):
10+ ctxt['disable_100_continue'] = False
11+ else:
12+ # NOTE: currently only applied if NOT using embedded webserver
13+ ctxt['disable_100_continue'] = True
14+
15 if self.context_complete(ctxt):
16 return ctxt
17
18
19=== modified file 'templates/ceph.conf'
20--- templates/ceph.conf 2015-11-26 16:20:26 +0000
21+++ templates/ceph.conf 2015-12-21 17:41:22 +0000
22@@ -19,7 +19,7 @@
23 log file = /var/log/ceph/radosgw.log
24 {% if embedded_webserver %}
25 rgw frontends = civetweb port=70
26-{% else %}
27+{% elif disable_100_continue %}
28 # Turn off 100-continue optimization as stock mod_fastcgi
29 # does not support it
30 rgw print continue = false
31
32=== modified file 'unit_tests/test_ceph_radosgw_context.py'
33--- unit_tests/test_ceph_radosgw_context.py 2015-11-26 16:20:26 +0000
34+++ unit_tests/test_ceph_radosgw_context.py 2015-12-21 17:41:22 +0000
35@@ -162,6 +162,7 @@
36 expect = {
37 'auth_supported': 'cephx',
38 'embedded_webserver': False,
39+ 'disable_100_continue': True,
40 'hostname': '10.0.0.10',
41 'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
42 'old_auth': False,
43@@ -195,6 +196,7 @@
44 expect = {
45 'auth_supported': 'none',
46 'embedded_webserver': False,
47+ 'disable_100_continue': True,
48 'hostname': '10.0.0.10',
49 'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
50 'old_auth': False,
51@@ -220,6 +222,7 @@
52 expect = {
53 'auth_supported': 'cephx',
54 'embedded_webserver': False,
55+ 'disable_100_continue': True,
56 'hostname': '10.0.0.10',
57 'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
58 'old_auth': False,

Subscribers

People subscribed via source and target branches