4285f14a55
This change adds functionality to allow the ceph osd cluster to
upgrade in a serial rolled fashion. This will use the ceph monitor
cluster to lock and allows only 1 ceph osd server at a time to upgrade.
The upgrade is initiated setting a config value for source for the
service which will prompt the osd cluster to upgrade to that new
source and restart all osds processes server by server. If an osd
server has been waiting on a previous server for more than 10 minutes
and hasn't seen it finish it will assume it died during the upgrade
and proceed with its own upgrade.
I had to modify the amulet test slightly to use the ceph-mon charm
instead of the default ceph charm. I also changed the test so that
it uses 3 ceph-osd servers instead of 1.
Limtations of this patch: If the osd failure domain has been set to osd
than this patch will cause brief temporary outages while osd processes
are being restarted. Future work will handle this case.
This reverts commit db09fdce93.
Change-Id: Ied010278085611b6d552e050a9d2bfdad7f3d35d
51 lines
1.2 KiB
Plaintext
51 lines
1.2 KiB
Plaintext
[global]
|
|
{% if old_auth %}
|
|
auth supported = {{ auth_supported }}
|
|
{% else %}
|
|
auth cluster required = {{ auth_supported }}
|
|
auth service required = {{ auth_supported }}
|
|
auth client required = {{ auth_supported }}
|
|
{% endif %}
|
|
keyring = /etc/ceph/$cluster.$name.keyring
|
|
mon host = {{ mon_hosts }}
|
|
fsid = {{ fsid }}
|
|
|
|
log to syslog = {{ use_syslog }}
|
|
err to syslog = {{ use_syslog }}
|
|
clog to syslog = {{ use_syslog }}
|
|
debug osd = {{ loglevel }}/5
|
|
|
|
{%- if ceph_public_network is string %}
|
|
public network = {{ ceph_public_network }}
|
|
{%- endif %}
|
|
{%- if ceph_cluster_network is string %}
|
|
cluster network = {{ ceph_cluster_network }}
|
|
{%- endif %}
|
|
|
|
{% if public_addr %}
|
|
public addr = {{ public_addr }}
|
|
{% endif %}
|
|
{% if cluster_addr %}
|
|
cluster addr = {{ cluster_addr }}
|
|
{%- endif %}
|
|
|
|
{% if crush_location %}
|
|
osd crush location = {{crush_location}}
|
|
{% endif %}
|
|
|
|
[client.osd-upgrade]
|
|
keyring = /var/lib/ceph/osd/ceph.client.osd-upgrade.keyring
|
|
|
|
[mon]
|
|
keyring = /var/lib/ceph/mon/$cluster-$id/keyring
|
|
|
|
[mds]
|
|
keyring = /var/lib/ceph/mds/$cluster-$id/keyring
|
|
|
|
[osd]
|
|
keyring = /var/lib/ceph/osd/$cluster-$id/keyring
|
|
osd journal size = {{ osd_journal_size }}
|
|
filestore xattr use omap = true
|
|
journal dio = {{ dio }}
|
|
|