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
=== modified file 'hooks/ceph_radosgw_context.py'
--- hooks/ceph_radosgw_context.py 2015-11-26 16:20:26 +0000
+++ hooks/ceph_radosgw_context.py 2015-12-21 17:41:22 +0000
@@ -102,6 +102,13 @@
102 'loglevel': config('loglevel'),102 'loglevel': config('loglevel'),
103 }103 }
104104
105 if (config('use-ceph-optimised-packages') and
106 not config('use-embedded-webserver')):
107 ctxt['disable_100_continue'] = False
108 else:
109 # NOTE: currently only applied if NOT using embedded webserver
110 ctxt['disable_100_continue'] = True
111
105 if self.context_complete(ctxt):112 if self.context_complete(ctxt):
106 return ctxt113 return ctxt
107114
108115
=== modified file 'templates/ceph.conf'
--- templates/ceph.conf 2015-11-26 16:20:26 +0000
+++ templates/ceph.conf 2015-12-21 17:41:22 +0000
@@ -19,7 +19,7 @@
19log file = /var/log/ceph/radosgw.log19log file = /var/log/ceph/radosgw.log
20{% if embedded_webserver %}20{% if embedded_webserver %}
21rgw frontends = civetweb port=7021rgw frontends = civetweb port=70
22{% else %}22{% elif disable_100_continue %}
23# Turn off 100-continue optimization as stock mod_fastcgi23# Turn off 100-continue optimization as stock mod_fastcgi
24# does not support it24# does not support it
25rgw print continue = false25rgw print continue = false
2626
=== modified file 'unit_tests/test_ceph_radosgw_context.py'
--- unit_tests/test_ceph_radosgw_context.py 2015-11-26 16:20:26 +0000
+++ unit_tests/test_ceph_radosgw_context.py 2015-12-21 17:41:22 +0000
@@ -162,6 +162,7 @@
162 expect = {162 expect = {
163 'auth_supported': 'cephx',163 'auth_supported': 'cephx',
164 'embedded_webserver': False,164 'embedded_webserver': False,
165 'disable_100_continue': True,
165 'hostname': '10.0.0.10',166 'hostname': '10.0.0.10',
166 'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',167 'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
167 'old_auth': False,168 'old_auth': False,
@@ -195,6 +196,7 @@
195 expect = {196 expect = {
196 'auth_supported': 'none',197 'auth_supported': 'none',
197 'embedded_webserver': False,198 'embedded_webserver': False,
199 'disable_100_continue': True,
198 'hostname': '10.0.0.10',200 'hostname': '10.0.0.10',
199 'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',201 'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
200 'old_auth': False,202 'old_auth': False,
@@ -220,6 +222,7 @@
220 expect = {222 expect = {
221 'auth_supported': 'cephx',223 'auth_supported': 'cephx',
222 'embedded_webserver': False,224 'embedded_webserver': False,
225 'disable_100_continue': True,
223 'hostname': '10.0.0.10',226 'hostname': '10.0.0.10',
224 'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',227 'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
225 'old_auth': False,228 'old_auth': False,

Subscribers

People subscribed via source and target branches