diff --git a/config.yaml b/config.yaml index 8f3235f2..0cb65e7e 100644 --- a/config.yaml +++ b/config.yaml @@ -41,3 +41,8 @@ options: default: 600 type: int description: Interval between revocation checks to keystone. + use-syslog: + type: boolean + default: False + description: | + If set to True, supporting services will log to syslog. diff --git a/hooks/hooks.py b/hooks/hooks.py index 3f125f0d..9073a252 100755 --- a/hooks/hooks.py +++ b/hooks/hooks.py @@ -73,7 +73,8 @@ def emit_cephconf(): 'auth_supported': get_auth() or 'none', 'mon_hosts': ' '.join(get_mon_hosts()), 'hostname': get_unit_hostname(), - 'version': ceph.get_ceph_version('radosgw') + 'version': ceph.get_ceph_version('radosgw'), + 'use_syslog': str(config('use-syslog')).lower() } # Check to ensure that correct version of ceph is diff --git a/revision b/revision index 7273c0fa..6f4247a6 100644 --- a/revision +++ b/revision @@ -1 +1 @@ -25 +26 diff --git a/templates/ceph.conf b/templates/ceph.conf index b71c20f4..14f088f7 100644 --- a/templates/ceph.conf +++ b/templates/ceph.conf @@ -7,6 +7,9 @@ auth client required = {{ auth_supported }} {% endif %} mon host = {{ mon_hosts }} + log to syslog = {{ use_syslog }} + err to syslog = {{ use_syslog }} + clog to syslog = {{ use_syslog }} [client.radosgw.gateway] host = {{ hostname }}