openstack
/
charm-ceph-radosgw
Code Issues Proposed changes

[hopem, r=gnuoy] Add debug and verbose config options. 

Closes-Bug: 1520236
This commit is contained in:
Liam Young 2015-12-01 10:43:01 +00:00
parent d96c019ab2 ff999102f2
commit c64512cf50
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.yaml
View File

@ -1,4 +1,8 @@
options:
loglevel:
default: 1
type: int
description: RadosGW debug level. Max is 20.
source:
type: string
default:

1
hooks/ceph_radosgw_context.py
View File

@ -99,6 +99,7 @@ class MonContext(context.OSContextGenerator):
'old_auth': cmp_pkgrevno('radosgw', "0.51") < 0,
'use_syslog': str(config('use-syslog')).lower(),
'embedded_webserver': config('use-embedded-webserver'),
'loglevel': config('loglevel'),
}
if self.context_complete(ctxt):

1
templates/ceph.conf
View File

@ -10,6 +10,7 @@ mon host = {{ mon_hosts }}
log to syslog = {{ use_syslog }}
err to syslog = {{ use_syslog }}
clog to syslog = {{ use_syslog }}
debug rgw = {{ loglevel }}/5
[client.radosgw.gateway]
host = {{ hostname }}

9
unit_tests/test_ceph_radosgw_context.py
View File

@ -165,7 +165,8 @@ class MonContextTest(CharmTestCase):
'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,
'use_syslog': 'false'
'use_syslog': 'false',
'loglevel': 1,
}
self.assertEqual(expect, mon_ctxt())
@ -197,7 +198,8 @@ class MonContextTest(CharmTestCase):
'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,
'use_syslog': 'false'
'use_syslog': 'false',
'loglevel': 1,
}
self.assertEqual(expect, mon_ctxt())
@ -221,6 +223,7 @@ class MonContextTest(CharmTestCase):
'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,
'use_syslog': 'false'
'use_syslog': 'false',
'loglevel': 1,
}
self.assertEqual(expect, mon_ctxt())