openstack/charm-ceph-proxy
Code Issues Proposed changes

[hopem,r=]

Browse Source 
Add loglevel config option.
Closes-Bug: 1520236
This commit is contained in:
Edward Hope-Morley 2016-01-18 10:18:30 +00:00
commit d10a8a9507
3 changed files with 7 additions and 0 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: options:
loglevel:
default: 1
type: int
description: Mon and OSD debug level. Max is 20.
fsid: fsid:
type: string type: string
default: default:

1
hooks/ceph_hooks.py
View File

@ -99,6 +99,7 @@ def emit_cephconf():
'use_syslog': str(config('use-syslog')).lower(), 'use_syslog': str(config('use-syslog')).lower(),
'ceph_public_network': config('ceph-public-network'), 'ceph_public_network': config('ceph-public-network'),
'ceph_cluster_network': config('ceph-cluster-network'), 'ceph_cluster_network': config('ceph-cluster-network'),
'loglevel': config('loglevel'),
} }
if config('prefer-ipv6'): if config('prefer-ipv6'):

2
templates/ceph.conf
View File

@ -14,6 +14,8 @@ log to syslog = {{ use_syslog }}
err to syslog = {{ use_syslog }} err to syslog = {{ use_syslog }}
clog to syslog = {{ use_syslog }} clog to syslog = {{ use_syslog }}
mon cluster log to syslog = {{ use_syslog }} mon cluster log to syslog = {{ use_syslog }}
debug mon = {{ loglevel }}/5
debug osd = {{ loglevel }}/5
{%- if ceph_public_network is string %} {%- if ceph_public_network is string %}
public network = {{ ceph_public_network }} public network = {{ ceph_public_network }}