openstack/charm-glance
Code Issues Proposed changes

Rebase on trunk

Browse Source
This commit is contained in:
James Page 2014-04-10 16:49:18 +01:00
commit 0df8f525fe
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.yaml
View File

@ -40,8 +40,7 @@ options:
type: boolean
default: False
description: |
By default, all services will log into their corresponding log files.
Setting this to True will force all services to log to the syslog.
If set to True, supporting services will log to syslog.
# HA configuration settings
vip:
type: string

8
templates/ceph.conf
View File

@ -3,10 +3,14 @@
# glance configuration file maintained by Juju
# local changes may be overwritten.
###############################################################################
{% if auth %}
[global]
{% if auth -%}
auth_supported = {{ auth }}
#keyring = /etc/ceph/$cluster.$name.keyring
keyring = /etc/ceph/ceph.$name.keyring
mon host = {{ mon_hosts }}
{% endif %}
{% endif -%}
log to syslog = {{ use_syslog }}
err to syslog = {{ use_syslog }}
clog to syslog = {{ use_syslog }}