Switch to using ``ceph.conf`` template from charm-helpers
The Glance charm distributes a out of date ``ceph.conf`` template that among other things does not contain the ``rbd_features`` configuration. Switch to using the tempalte distributed with ``charm-helpers`` The effective diff between the two can be viewed here: https://gist.github.com/fnordahl/a4034999cec28fd70628599125b10bda Change-Id: I94f5a80c6ebfefdf7196cdf533f76931cfb22950
This commit is contained in:
parent
696d3821f9
commit
0d128e913f
|
@ -1,17 +0,0 @@
|
|||
###############################################################################
|
||||
# [ WARNING ]
|
||||
# glance configuration file maintained by Juju
|
||||
# local changes may be overwritten.
|
||||
###############################################################################
|
||||
[global]
|
||||
{% if auth -%}
|
||||
auth_supported = {{ auth }}
|
||||
#keyring = /etc/ceph/$cluster.$name.keyring
|
||||
keyring = /etc/ceph/ceph.$name.keyring
|
||||
mon host = {{ mon_hosts }}
|
||||
{% endif -%}
|
||||
{% if use_syslog -%}
|
||||
log to syslog = {{ use_syslog }}
|
||||
err to syslog = {{ use_syslog }}
|
||||
clog to syslog = {{ use_syslog }}
|
||||
{% endif -%}
|
Loading…
Reference in New Issue