openstack
/
charm-ceph-radosgw
Code Issues Proposed changes

[hopem, r=gnuoy] Don't disable HTTP 100-Continue if using ceph 

optimised packages with Apache.
Closes-Bug: 1515387
This commit is contained in:
Liam Young 2016-01-11 11:21:53 +00:00
parent 48eca657cc 164d08ae2a
commit 793f755ef7
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hooks/ceph_radosgw_context.py
View File

@ -109,6 +109,13 @@ class MonContext(context.OSContextGenerator):
if all([os.path.isfile(p) for p in paths]):
ctxt['cms'] = True
if (config('use-ceph-optimised-packages') and
not config('use-embedded-webserver')):
ctxt['disable_100_continue'] = False
else:
# NOTE: currently only applied if NOT using embedded webserver
ctxt['disable_100_continue'] = True
if self.context_complete(ctxt):
return ctxt

2
templates/ceph.conf
View File

@ -19,7 +19,7 @@ rgw socket path = /tmp/radosgw.sock
log file = /var/log/ceph/radosgw.log
{% if embedded_webserver %}
rgw frontends = civetweb port=70
{% else %}
{% elif disable_100_continue %}
# Turn off 100-continue optimization as stock mod_fastcgi
# does not support it
rgw print continue = false

3
unit_tests/test_ceph_radosgw_context.py
View File

@ -162,6 +162,7 @@ class MonContextTest(CharmTestCase):
expect = {
'auth_supported': 'cephx',
'embedded_webserver': False,
'disable_100_continue': True,
'hostname': '10.0.0.10',
'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
'old_auth': False,
@ -195,6 +196,7 @@ class MonContextTest(CharmTestCase):
expect = {
'auth_supported': 'none',
'embedded_webserver': False,
'disable_100_continue': True,
'hostname': '10.0.0.10',
'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
'old_auth': False,
@ -220,6 +222,7 @@ class MonContextTest(CharmTestCase):
expect = {
'auth_supported': 'cephx',
'embedded_webserver': False,
'disable_100_continue': True,
'hostname': '10.0.0.10',
'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
'old_auth': False,