[hopem] Added use-syslog cfg option to allow logging to syslog

This commit is contained in:
Edward Hope-Morley 2014-03-25 18:44:23 +00:00
parent 1a3c510aae
commit 2aa82ffdbc
4 changed files with 11 additions and 2 deletions

View File

@ -78,3 +78,8 @@ options:
description: | description: |
Key ID to import to the apt keyring to support use with arbitary source Key ID to import to the apt keyring to support use with arbitary source
configuration from outside of Launchpad archives or PPA's. configuration from outside of Launchpad archives or PPA's.
use-syslog:
type: boolean
default: False
description: |
If set to True, supporting services will log to syslog.

View File

@ -71,7 +71,8 @@ def emit_cephconf():
'mon_hosts': ' '.join(mon_hosts), 'mon_hosts': ' '.join(mon_hosts),
'fsid': get_fsid(), 'fsid': get_fsid(),
'version': ceph.get_ceph_version(), 'version': ceph.get_ceph_version(),
'osd_journal_size': config('osd-journal-size') 'osd_journal_size': config('osd-journal-size'),
'use_syslog': str(config('use-syslog')).lower()
} }
# Install ceph.conf as an alternative to support # Install ceph.conf as an alternative to support
# co-existence with other charms that write this file # co-existence with other charms that write this file

View File

@ -1 +1 @@
14 15

View File

@ -9,6 +9,9 @@
keyring = /etc/ceph/$cluster.$name.keyring keyring = /etc/ceph/$cluster.$name.keyring
mon host = {{ mon_hosts }} mon host = {{ mon_hosts }}
fsid = {{ fsid }} fsid = {{ fsid }}
log to syslog = {{ use_syslog }}
err to syslog = {{ use_syslog }}
clog to syslog = {{ use_syslog }}
[mon] [mon]
keyring = /var/lib/ceph/mon/$cluster-$id/keyring keyring = /var/lib/ceph/mon/$cluster-$id/keyring